Rollup of 7 pull requests#156066
Open
GuillaumeGomez wants to merge 20 commits intorust-lang:mainfrom
Open
Conversation
It has a single method and a single impl and the trait isn't directly used. It can just become an inherent method.
When you have `impl Foo for Bar` and `Bar` has no generics it's useless (and odd) to have `where Self: Baz` bounds on methods when the trait itself doesn't have those bounds. This commit removes a few.
FWIW, note that `Diagnostic` doesn't have this bound.
While reading through stuff I was noticing just how many `+1` fixes there were in various places (and comments explaining that fixup), so this adds a new inherent helper on `Local` for making an argument to help make this clearer.
It being a `Set` does not really make sense. You never really should do a `contains` on it, since you should normalize the tyvid to its root var first.
refactor rustc_on_unimplemented's filtering
Previously when you had a
```rust
pub struct Directive {
pub is_rustc_attr: bool,
pub condition: Option<OnUnimplementedCondition>,
pub subcommands: ThinVec<Directive>,
pub message: Option<(Span, FormatString)>,
...
}
```
that condition would control the emission of the message, label, notes etc. I've changed that to
```rust
pub struct Directive {
pub is_rustc_attr: bool,
pub filters: ThinVec<(Filter, Directive)>,
pub message: Option<(Span, FormatString)>,
...
```
so that the message etc is always emitted, and there's a vec of tuples with (filter, directive) where the filter controls whether that directive is even emitted, which i think is much clearer. That also makes it easier to not have to do the reverse iteration thing and this makes it so that notes are emitted in declaration order (with nonfiltered options always last).
The rename is because I plan on making it available to other diagnostic attributes at some point (very wip) so `OnUnimplementedCondition` and the like would have to be renamed anyway.
Improve source code for `librustdoc/visit_ast.rs` While working on this part of rustdoc, got annoyed at the tuples and decided to transform them into types. Code is now much easier to follow. :3 r? @Urgau
…r=jackh726 Clean up some traits I was looking at various traits and found some unnecessary trait bounds, and some unnecessary traits. Details in individual commits. r? @Nadrieril
Add a `Local::arg(i)` helper constructor While reading through stuff I was noticing just how many `+1` fixes there were in various places (and comments explaining those fixups), so this adds a new inherent helper on `Local` for making an argument to help make this clearer. r? mir
…, r=JonathanBrouwer Add AcceptContext::expect_no_args
Add missing alias to mailmap Fixes rust-lang/thanks#103.
… r=WaffleLapkin Make `diverging_type_vars` a vec of `TyVid` r? @lcnr The following changes, in separate commits: * Make its elements a `TyVid`, since there should never by any other types than `TyVars` in there * Make it a vec, since it being a set doesn't make much sense. You never really should do a `contains` on it, since you should normalize the tyvids in the set to their root var first.
rustbot
added
A-attributes
Member
Author
|
@bors r+ p=5 rollup=never |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
Contributor
|
⌛ Testing commit a80f8b5 with merge 9dad1a6... Workflow: https://github.com/rust-lang/rust/actions/runs/25236294279 |
rust-bors Bot
pushed a commit
that referenced
this pull request
May 1, 2026
Rollup of 7 pull requests Successful merges: - #155940 (refactor rustc_on_unimplemented's filtering) - #156020 (Improve source code for `librustdoc/visit_ast.rs`) - #156021 (Clean up some traits) - #156028 (Add a `Local::arg(i)` helper constructor) - #156037 (Add AcceptContext::expect_no_args) - #156040 (Add missing alias to mailmap) - #156048 (Make `diverging_type_vars` a vec of `TyVid`)
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:
librustdoc/visit_ast.rs#156020 (Improve source code forlibrustdoc/visit_ast.rs)Local::arg(i)helper constructor #156028 (Add aLocal::arg(i)helper constructor)diverging_type_varsa vec ofTyVid#156048 (Makediverging_type_varsa vec ofTyVid)r? @ghost
Create a similar rollup