Rollup of 6 pull requests#155214
Closed
JonathanBrouwer wants to merge 27 commits intorust-lang:mainfrom
Closed
Conversation
Avoid two of its uses in diagnostic reporting and effective visibility collection. The method is only supposed to be used inside the import resolution algorithm, and the removed uses happened after import resolution already converged. Some comments are also added.
Using `self.(non_)glob_decl` directly makes it more clear.
Using `self.(non_)glob_decl` directly makes it more clear.
It is no longer needed to pass import validation, and the removal avoids some secondary errors. Also add a couple of asserts
Fixes rust-lang#154619. If `DerefPure` were dyn-compatible, a trait object of a subtrait of `DerefPure` could be created by unsize-coercing an existing type that implements `DerefPure`. But then the trait object could have its own non-pure impl of `Deref`/`DerefMut`, which is unsound, since the trait object would implement `DerefPure`. Thus, we make `DerefPure` dyn-incompatible.
The span location of the last segment in the desugared path is inherited from the star symbol's span
…on body Instead of the last segment of the delegation path. `self` is something that introduced by the whole delegation item, not some specific part of it, and the last segment may need to have a different context for path resolution purposes.
…lacrum relnotes for 1.95 r? @Mark-Simulacrum cc @rust-lang/release
delegation: Track more precise spans for glob delegations The last commit also fixes a macro hygiene issue with `self` in delegations found in rust-lang#154002.
…=jdonszelmann Implement EII for statics This PR implements EII for statics. I've tried to mirror the implementation for functions in a few places, this causes some duplicate code but I'm also not really sure whether there's a clean way to merge the implementations. This does not implement defaults for static EIIs yet, I will do that in a followup PR
resolve: Some import resolution cleanups See the individual commits
…, r=jackh726 Make `DerefPure` dyn-incompatible Fixes rust-lang#154619. If `DerefPure` were dyn-compatible, a trait object of a subtrait of `DerefPure` could be created by unsize-coercing an existing type that implements `DerefPure`. But then the trait object could have its own non-pure impl of `Deref`/`DerefMut`, which is unsound, since the trait object would implement `DerefPure`. Thus, we make `DerefPure` dyn-incompatible. r? types
…ouwer Improve emission of `UnknownDiagnosticAttribute` lint This checks features much less than the current implementation. See rust-lang#155155 for context. Minor fixes and comments are added in the second and third commit.
rustbot
added
A-attributes
rustbot
added
S-waiting-on-review
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
Author
|
Feel free to recreate this rollup if a lot more rollupable prs enter the queue while the releases run :) |
Contributor
|
⌛ Testing commit f7227e3 with merge a27f6b9... Workflow: https://github.com/rust-lang/rust/actions/runs/24323796383 |
rust-bors bot
pushed a commit
that referenced
this pull request
Apr 13, 2026
…uwer Rollup of 6 pull requests Successful merges: - #155162 (relnotes for 1.95) - #154049 (delegation: Track more precise spans for glob delegations) - #154193 (Implement EII for statics) - #154435 (resolve: Some import resolution cleanups) - #154624 (Make `DerefPure` dyn-incompatible) - #155174 (Improve emission of `UnknownDiagnosticAttribute` lint)
Member
Contributor
|
Auto build was cancelled. Cancelled workflows: The next pull request likely to be tested is #155211. |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Apr 13, 2026
Rollup of 6 pull requests try-job: dist-x86_64-linux
rust-bors
bot
added
S-waiting-on-author
Contributor
|
This pull request was unapproved due to being closed. |
Contributor
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
7 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:
DerefPuredyn-incompatible #154624 (MakeDerefPuredyn-incompatible)UnknownDiagnosticAttributelint #155174 (Improve emission ofUnknownDiagnosticAttributelint)r? @ghost
Create a similar rollup