Rollup of 18 pull requests #76422
Merged
Rollup of 18 pull requests #76422
Conversation
This file contains 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
These tests are about the standard library, not the compiler itself, thus should live in `library`, see rust-lang#76268.
Move: - `src\test\ui\consts\const-nonzero.rs` to `library\core` - `src\test\ui\consts\ascii.rs` to `library\core` - `src\test\ui\consts\cow-is-borrowed` to `library\alloc` Part of rust-lang#76268
If two features are defined as incompatible, using them together would result in an error
Co-authored-by: Joshua Nelson <[email protected]>
`max_atomic_width` was missing in the spec, which means it fell back to the pointer width of 16 bits.
Move some Vec UI tests into alloc unit tests A bit of work towards rust-lang#76268, makes a number of the Vec UI tests that are simply running code into unit tests. Ensured that they are being run when testing liballoc locally.
Allow try blocks as the argument to return expressions Fixes rust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
Remove an unnecessary allowed lint It is outdated.
…, r=lcnr Implementation of incompatible features error Proposal of a new error: Incompatible features This error should happen if two features which are not compatible are used together. For now the only incompatible features are `const_generics` and `min_const_generics` fixes rust-lang#76280
Make `Ipv4Addr` and `Ipv6Addr` const tests unit tests under `library` These tests are about the standard library, not the compiler itself, thus should live in `library`, see rust-lang#76268.
Address review comments on `Peekable::next_if` r? @pickfire See rust-lang#72310 (review) for context.
Link to `#capacity-and-reallocation` when using with_capacity Follow up to rust-lang#76058 (comment). r? @pickfire
Move various ui const tests to `library` Move: - `src\test\ui\consts\const-nonzero.rs` to `library\core` - `src\test\ui\consts\ascii.rs` to `library\core` - `src\test\ui\consts\cow-is-borrowed` to `library\alloc` Part of rust-lang#76268 r? @matklad
Indent a note to make folding work nicer Sublime Text folds code based on indentation. It maybe an unnecessary change, but does it look nicer after that ?
time.rs: Make spelling of "Darwin" consistent On line 89 of this file, the OS name is written as "Darwin", but on line 162 it is written in all-caps. Darwin is usually spelt as a standard proper noun, i.e. "Darwin", rather than in all-caps. This change makes that form consistent in both places.
…ic-morse Use ops::ControlFlow in rustc_data_structures::graph::iterate Since I only know about this because you mentioned it, r? @ecstatic-morse If we're not supposed to use new `core` things in compiler for a while then feel free to close, but it felt reasonable to merge the two types since they're the same, and it might be convenient for people to use `?` in their traversal code. (This doesn't do the type parameter swap; NoraCodes has signed up to do that one.)
…ibrary, r=matklad Move Vec slice UI tests in library Moved some of Vec slice UI tests in Library as a part of rust-lang#76268 r? @matklad
add some intra-doc links to `Iterator`
…ulacrum Remove unused duplicated `trivial_dropck_outlives` The copy that is actually in use now lives here: https://github.com/rust-lang/rust/blob/d2454643e137bde519786ee9e650c455d7ad6f34/compiler/rustc_trait_selection/src/traits/query/dropck_outlives.rs#L84
Improve docs for `std::env::args()` @rustbot modify labels: T-doc
Docs: nlink example typo Small typo fix for the `nlink` function, extra whitespace before the `use` declaration
Minor grammar fix in doc comment for soft-deprecated methods
…mic, r=jonas-schievink Disable atomics on avr target. `max_atomic_width` was missing in the spec, which means it fell back to the pointer width of 16 bits. Fixes rust-lang#76363.
|
@bors r+ rollup=never p=5 |
|
📌 Commit 23f8dd1 has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions, checks-azure |
This was referenced Sep 7, 2020
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.
Successful merges:
Ipv4AddrandIpv6Addrconst tests unit tests underlibrary#76299 (MakeIpv4AddrandIpv6Addrconst tests unit tests underlibrary)Peekable::next_if#76302 (Address review comments onPeekable::next_if)#capacity-and-reallocationwhen using with_capacity #76303 (Link to#capacity-and-reallocationwhen using with_capacity)library#76305 (Move various ui const tests tolibrary)Iterator#76338 (add some intra-doc links toIterator)trivial_dropck_outlives#76340 (Remove unused duplicatedtrivial_dropck_outlives)std::env::args()#76344 (Improve docs forstd::env::args())Failed merges:
std::net::IpAddrunstably const #76304 (Make delegation methods ofstd::net::IpAddrunstably const)r? @ghost