Rollup of 4 pull requests#157632
Closed
JonathanBrouwer wants to merge 13 commits into
Closed
Conversation
Letting `lower_lifetime` check `tcx.named_bound_var` & call `re_infer` just means we now end up passing `lifetime.ident.span` to `re_infer` instead of the `span` of the trait object type. However, 1. in the case of `LifetimeKind::ImplicitObjectLifetimeDefault` `lifetime.ident.span` is actually equal to said span. 2. in the case of `LifetimeKind::Infer` the span now makes more sense; consider `dyn Trait + '_` where the span now just contains the `'_` not the entire type which is just better.
…nfer` This makes it really obvious that we're computing object region bounds for `Infer`, too, not just for `ImplicitObjectLifetimeDefault` which was really hard to see beforehand. It's unclear to me whether this was intentional or not, needs investigation. Introduce method `lower_trait_object_lifetime` to allow usage of early returns to make the control flow clearer compared to the `unwrap_or_else`.
Reorganize `tests/ui/issues` [6/N] Part of [GSoC'26 project](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Reorganizing.20tests.2Fui.2Fissues) r? Kivooeo @Teapot4195
…wnGnome Remove comments already covered by rustdoc Since rust-lang#157310 was merged, rustdoc renders `impl` restrictions. As such, these comments are no longer necessary.
…ivooeo Simplify the HIR ty lowering of trait object lifetime bounds See individual commit messages for details.
rustc_resolve: point the label span at the segment that could not be resolved This is part of work that @weiznich and I are doing for `#[diagnostic::on_unknown]`. This means that you can put the attribute in macro_rules macros and have the label message point at the input the user gave. It's imo also the right thing to point the span at in general. ```rust mod things {} macro_rules! mac { ($thing: ident) => {{ const _x: u32 = { #[diagnostic::on_unknown(label = "you did the bad thing")] use things::$thing; //~^ERROR unresolved import `things::what` [E0432] //~|ERROR unresolved import `things::what2` [E0432] $thing }; }}; } ``` ``` LL | | what2 | | ----- you did the bad thing ``` See also the first and last commit for what these messages look(ed) like. cc @estebank
rustbot
added
O-unix
Contributor
Author
Contributor
rust-bors
Bot
added
S-waiting-on-bors
Contributor
|
⌛ Trying commit 345d67c with merge ee87232… To cancel the try build, run the command Workflow: https://github.com/rust-lang/rust/actions/runs/27181793674 |
rust-bors Bot
pushed a commit
that referenced
this pull request
Jun 9, 2026
Rollup of 4 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-2
rust-bors
Bot
added
the
S-waiting-on-author
Contributor
|
This pull request was unapproved due to being closed. |
rust-bors
Bot
removed
the
S-waiting-on-bors
Contributor
Author
|
@bors try cancel |
Contributor
|
Try build cancelled. Cancelled workflows: |
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
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:
tests/ui/issues[6/N] #157547 (Reorganizetests/ui/issues[6/N])r? @ghost
Create a similar rollup