-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
Rollup of 11 pull requests #152430
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Rollup of 11 pull requests #152430
+1,986
−1,471
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
Make fmt check happy
Requiring `fn` in the macro syntax makes it a little more obvious that the macro declares functions with those names, and makes them easier to grep for.
…nbrouwer Port a lot of attributes to the new parser r? @JonathanBrouwer See commits for which attributes
…-message, r=eholk Add help message suggesting explicit reference cast for From/TryFrom Closes rust-lang#109829 Improves E0277 diagnostics when a `From` or `TryFrom` implementation is expected, but the provided type is a reference that can be explicitly cast to a type the trait can convert from.
Move `impl Interner for TyCtxt` to its own submodule This impl is several hundred lines of mostly self-contained, mostly boilerplate code that can be extracted out of the dauntingly large `rustc_middle::ty::context` module. - The trait and its impl were introduced by rust-lang#97287. --- There should be no change to compiler behaviour.
…ect-lifetime-diag, r=chenyukang Modernize diagnostic for indeterminate trait object lifetime bounds * remove suggestion from the diagnostic message (bad style, too long) and turn it into a structured suggestion * replace *object type* with *trait object type* since the former is an outdated term
…nnethercote Remove `SubdiagMessage` in favour of the identical `DiagMessage` For rust-lang#151366 Just some more cleanup :) SubdiagMessage is now identical to DiagMessage, so there's no point in having both of them
Move the needs-drop check for `arena_cache` queries out of macro code This is slightly simpler than before, because now the macro only needs to call a single function, and can just unconditionally supply `tcx` and a typed arena. There should be no actual change to compiler behaviour.
…nkov typeck: Make it clearer that `check_pat_lit` only handles literal patterns Nowadays, the `hir::PatExprKind` enum guarantees that “expressions” in patterns can only be paths or literals. `PatExprKind::Path` is already handled by the previous match arm, so we can make this match arm explicitly match on `PatExprKind::Lit` without losing exhaustiveness. There should be no actual change to compiler behaviour.
…mimi Format heterogeneous try blocks The tracking issue for `try_blocks_heterogeneous` is rust-lang#149488. This follows the formatting of homogeneous try blocks (feature `try_blocks`) by considering `try bikeshed <type>` to be the equivalent of `try` (in particular a single "token"). An alternative would be to permit breaking between `bikeshed` and `<type>`, but given that those 2 elements are an explicitly temporary part of the syntax, it doesn't seem worth it. There also doesn't seem to be any existing precedent breaking between a keyword and a type. It also doesn't seem to be useful in practice, given that the type itself doesn't break (which is how it works for the return type of closures) and has more chances to dominate the length in case a break is necessary. Happy to adapt anything in case this formatting is not optimal. The test is also copied from homogeneous try blocks with 2 additional test cases to demonstrate the behavior with long types. See [#t-lang > try blocks @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/213817-t-lang/topic/try.20blocks/near/572387493) for context.
…r=nnethercote Update documentation of rustc_macros Update the docs to reflect the changes in rust-lang#151366
…e, r=lcnr Uplift `Predicate::allow_normalization` to `rustc_type_ir` Found this FIXME comment while fixing a bug in rust-analyzer 😄 cc rust-lang/rust-analyzer#21611 r? types
…ouwer Port #![test_runner] to the attribute parser Tracking issue: rust-lang#131229 r? @JonathanBrouwer
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 10, 2026
…uwer Rollup of 11 pull requests Successful merges: - #152364 (Port a lot of attributes to the new parser) - #151954 (Add help message suggesting explicit reference cast for From/TryFrom) - #152148 (Move `impl Interner for TyCtxt` to its own submodule) - #152226 (Modernize diagnostic for indeterminate trait object lifetime bounds) - #152351 (Remove `SubdiagMessage` in favour of the identical `DiagMessage`) - #152417 (Move the needs-drop check for `arena_cache` queries out of macro code) - #150688 (typeck: Make it clearer that `check_pat_lit` only handles literal patterns) - #152293 (Format heterogeneous try blocks) - #152355 (Update documentation of rustc_macros) - #152396 (Uplift `Predicate::allow_normalization` to `rustc_type_ir`) - #152425 (Port #![test_runner] to the attribute parser)
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
💔 Test for 9889b37 failed: CI. Failed job:
|
Contributor
Author
|
Hmmm I was also able to reproduce this locally, so not spurious, but also not sure which PR causes this. |
Contributor
Author
Contributor
|
PR #152425, which is a member of this rollup, was unapproved. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-attributes
Area: Attributes (`#[…]`, `#![…]`)
A-rustc-dev-guide
Area: rustc-dev-guide
A-translation
Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic
rollup
A PR which is a rollup
T-clippy
Relevant to the Clippy team.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
T-rustfmt
Relevant to the rustfmt team, which will review and decide on the PR/issue.
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:
impl Interner for TyCtxtto its own submodule #152148 (Moveimpl Interner for TyCtxtto its own submodule)SubdiagMessagein favour of the identicalDiagMessage#152351 (RemoveSubdiagMessagein favour of the identicalDiagMessage)arena_cachequeries out of macro code #152417 (Move the needs-drop check forarena_cachequeries out of macro code)check_pat_litonly handles literal patterns #150688 (typeck: Make it clearer thatcheck_pat_litonly handles literal patterns)Predicate::allow_normalizationtorustc_type_ir#152396 (UpliftPredicate::allow_normalizationtorustc_type_ir)r? @ghost
Create a similar rollup