Rollup of 7 pull requests #152301
Closed
Rollup of 7 pull requests #152301
+1,640
−5,712
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
This lint is allowed by default nowadays.
Rustc no longer depends on winapi. Only cg_clif, cg_gcc and rustfmt still use it, none of which are libraries to compile against. And in case of both cg_clif and cg_gcc it never ends up in an artifact we ship. For cg_clif it only shows up when the jit mode is enabled, which is not the case for the version we ship. For cg_gcc it is used by a test executable, which isn't shipped either.
These flags should be available on the bootstrap compiler.
This addresses the need for clarification brought up in an issue.
Specifically, it notes that some implementations may choose to panic if
they detect deadlock situations during recursive locking attempts for
both `read()` and `write()` calls.
* Provide an example highlighting that multiple read locks can be
held across different threads simultaneously.
* Remove the example that shows a situation that can potentially deadlock.
(as demonstrated in the very same documentation a few paragraphs
above)
* Improve documentation regarding the possibility of panics during
recursive read or write lock attempts.
Issues: Ambiguity in RwLock documentation about multiple read() calls...
Signed-off-by: Henner Zeller <h.zeller@acm.org>
…=clubby789 Remove a couple of unnecessary flags and env vars in bootstrap
…onszelmann Convert to inline diagnostics in `rustc_lint` For rust-lang#151366 r? @jdonszelmann This was a big one! Second to last one, `rustc_parse` is the last one and even bigger :P
…wlock-reentrance, r=joboet RwLock: refine documentation to emphasize non-reentrancy guarantees This addresses the need for clarification brought up in rust-lang#149693. Specifically, it notes that some implementations may choose to panic if they detect deadlock situations during recursive locking attempts for both `read()` and `write()` calls. * Provide an example highlighting that multiple read locks can be held across different threads simultaneously. * Remove the example that shows a situation that can potentially deadlock. (as demonstrated in the very same documentation a few paragraphs above) * Improve documentation regarding the possibility of panics during recursive read or write lock attempts. Issues: rust-lang#149693
…n-impl, r=JonathanBrouwer Port `rustc_reservation_impl` to the new attribute parser r? @JonathanBrouwer
Introduce helper `ty::Generics::has_own_self` The pattern `generics.has_self && generics.parent.is_none()` only occurs 5 times in rustc+rustdoc at the time of writing but I keep getting reminded/annoyed that there doesn't exist a nice wrapper fn that abstracts it & immediately clarifies the intent. Most recently that happened when working on my open PR RUST-129543 in which I add yet another occurrence of it ([via](https://github.com/fmease/rust/blob/ae8c0a5a46364b0d0bca349cba544adb762e7c0a/compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs#L1771-L1773)). For context, `generics.has_self` indicates that there is a `Self` type parameter (at position 0) in the "oldest" / "root" generic parameter list in the chain of generic parameter lists (rephrased: it's true if the chain *as a whole* has a `Self` type parameter). `has_own_self` on the other hand indicates that the `own_params` contain a `Self` type parameter which is sometimes needed for offsetting the own parameters or arguments.
…ttr, r=jdonszelmann Allow only a single accepter per attribute This is what we discussed last thursday, that we don't need to support this. r? @jdonszelmann
…ant-dtor, r=JonathanBrouwer Port `rustc_insignificant_dtor` r? @JonathanBrouwer Second commit removes it from an impl in std. I looked, and I really think it had no effect in the past. We only look for this attr on ADTs...
rustbot
added
A-attributes
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
|
☔ The latest upstream changes (presumably #152294) made this pull request unmergeable. Please resolve the merge conflicts. This pull request was unapproved. |
rust-bors
bot
removed
the
S-waiting-on-bors
rustbot
removed
the
S-waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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:
rustc_lint#152217 (Convert to inline diagnostics inrustc_lint)rustc_reservation_implto the new attribute parser #152180 (Portrustc_reservation_implto the new attribute parser)ty::Generics::has_own_self#152261 (Introduce helperty::Generics::has_own_self)rustc_insignificant_dtor#152291 (Portrustc_insignificant_dtor)Failed merges:
rust_nonnull_optimization_guaranteedandrustc_do_not_const_checkto the new attribute parser #152296 (Portrust_nonnull_optimization_guaranteedandrustc_do_not_const_checkto the new attribute parser)rustc_regionsto the new attribute parser #152300 (Portrustc_regionsto the new attribute parser)r? @ghost
Create a similar rollup