Add and use generics.is_empty(), rather than checking generics' params vec
#123929
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
rustbot
added
S-waiting-on-review
Collaborator
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy HIR ty lowering was modified cc @fmease Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt |
compiler-errors
commented
Apr 14, 2024
Member
Author
compiler-errors
left a comment
compiler-errors
left a comment
There was a problem hiding this comment.
Yeah, after a self-review it's kind of certain there are more places where it's wrong to use this than right.
| let gat_generics = tcx.generics_of(gat_def_id); | ||
| // FIXME(jackh726): we can also warn in the more general case | ||
| if gat_generics.params.is_empty() { | ||
| if gat_generics.is_empty() { |
Member
Author
There was a problem hiding this comment.
Oops, this is wrong!
| // type of `foo` (possibly adjusted), but we don't want to | ||
| // include that. We want just the `[_, u32]` part. | ||
| if !args.is_empty() && !generics.params.is_empty() { | ||
| if !args.is_empty() && !generics.is_empty() { |
Member
Author
There was a problem hiding this comment.
This is also wrong
| // here and so associated type bindings will be handled regardless of whether there are any | ||
| // non-`Self` generic parameters. | ||
| if generics.params.is_empty() { | ||
| if generics.is_empty() { |
| if let Adt(def, _) = self_ty.kind() { | ||
| let generics = self.tcx.generics_of(def.did()); | ||
| if !generics.params.is_empty() { | ||
| if !generics.is_empty() { |
| assert_eq!(args.len(), generics.parent_count); | ||
|
|
||
| let xform_fn_sig = if generics.params.is_empty() { | ||
| let xform_fn_sig = if generics.is_empty() { |
| // on top of the same path, but without its own generics. | ||
| _ => { | ||
| if !generics.params.is_empty() && args.len() >= generics.count() { | ||
| if !generics.is_empty() && args.len() >= generics.count() { |
| ty::AssocKind::Type => { | ||
| if !tcx.features().generic_associated_types_extended | ||
| && !tcx.generics_of(item.def_id).params.is_empty() | ||
| && !tcx.generics_of(item.def_id).is_empty() |
| // that means that we must have newly inferred something about the GAT. | ||
| // We should give up in that case. | ||
| if !generics.params.is_empty() | ||
| if !generics.is_empty() |
| && let FnRetTy::Return(ret) = sig.decl.output | ||
| && is_nameable_in_impl_trait(ret) | ||
| && cx.tcx.generics_of(item_did).params.is_empty() | ||
| && cx.tcx.generics_of(item_did).is_empty() |
Member
Author
There was a problem hiding this comment.
Hm, this is wrong
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Member
|
I guess you have decided to not proceed with this change, right?. I was suggesting something like an |
Member
Author
|
@spastorino: feel free to do the change yourself -- you can use the comments above to figure out where we care about is_own_empty vs is_empty. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 19, 2024
…iler-errors Add and use generics.is_empty() and generics.is_own_empty, rather than using generics' attributes r? `@compiler-errors` Related to rust-lang#123929
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
r? spastorino