Rolling up PRs in the queue #20104
Merged
Rolling up PRs in the queue #20104
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Take the docs from Rc<T>, apply them to Arc<T>, and fix some line lengths.
Disambiguate maximally by using 'and' instead of '&' next to discussion about references. As a bonus, fix the spelling of the car too.
This narrows the definition of nested returns such that only when the outer return has a chance of being executed (due to the inner return being conditional) do we mark the function as having nested returns. Fixes rust-lang#19684
There is currently no way to specify the stability level for a trait impl produced by `deriving`. This patch is a stopgap solution that: * Turns of stability inheritance for trait impls, and * Uses the stability level of the *trait* if no level is directly specified. That is, manual trait impls may still provide a directly stability level, but `deriving` will use the level of the trait. While not a perfect solution, it should be good enough for 1.0 API stabilization, as we will like *remove* any unwanted impls outright.
The use of `+a+x` is deprecated. Fixes rust-lang#19981.
The current indentation level would indicate that Boolean literals are on the same level as Integer and Float literals under Number literals, unindenting moves it to the same scope as Character and string literals, Byte and byte string literals, and Number literals under Literals.
This commit modifies rustdoc to not require these empty modules to be public in the standard library. The modules still remain as a location to attach documentation to, but the modules themselves are now private (don't have to commit to an API). The documentation for the standard library now shows all of the primitive types on the main index page.
Tweak CovariantType, ContravariantType, and InvariantType to allow their type parameter to be unsized.
This fixes rust-lang#19978. The bug was introduced by 570325d, where if the type of an Fn has not been inferred (strs[0] is "_") we slice from 1 to 0. We now explicitly check if `strs[0]` is a single element tuple.
Encode foreign item attributes and stability levels and visit foreign items in the stability visitor. cc @gankro
Instead, just pass everything through as a Vec<u8> to get worried about later. Closes rust-lang#20091
Conflicts: src/libcollections/string.rs src/libcollections/vec.rs src/snapshots.txt
|
Is this commit also included here? It's needed for the snapshot and I don't see it. |
|
🐎 go little rollup go |
|
Thanks @alexcrichton |
|
I wonder how big until bors overflows the priority |
|
@nikomatsakis: It's Python so it's a big integer. I doubt that GitHub will let you make a long enough comment to cause an out-of-memory error :P. |
|
wooooo 🎅 @bors bringing us 🎁 🎁 🎁 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.