feat: Add two new diagnostics: one for mismatch in generic arguments count, and another for mismatch in their kind #19479
Conversation
This file contains 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
the
S-waiting-on-review
ChayimFriedman2
force-pushed
the
generic-mismatch
branch
from
ee1a69e to
abc50a7
Compare
ChayimFriedman2
force-pushed
the
generic-mismatch
branch
3 times, most recently
from
b8c3e02 to
107dbaa
Compare
… and another for mismatch in their kind Also known as E0747 and E0107. And by the way, rewrite how we lower generic arguments and deduplicate it between paths and method calls. The new version is taken almost straight from rustc. This commit also changes the binders of `generic_defaults()`, to only include the binders of the arguments up to (and not including) the current argument. This make it easier to handle it in the rewritten lowering of generic args. It's also how rustc does it.
It's cute, isn't it?
ChayimFriedman2
force-pushed
the
generic-mismatch
branch
from
107dbaa to
8de5777
Compare
Veykril
approved these changes
Apr 21, 2025
Comment on lines
+3232
to
+3261
|
|
||
| /// This function find the AST fragment that corresponds to an `AssociatedTypeBinding` in the HIR. | ||
| pub fn hir_assoc_type_binding_to_ast( | ||
| segment_args: &ast::GenericArgList, | ||
| binding_idx: u32, | ||
| ) -> Option<ast::AssocTypeArg> { | ||
| segment_args | ||
| .generic_args() | ||
| .filter_map(|arg| match arg { | ||
| ast::GenericArg::AssocTypeArg(it) => Some(it), | ||
| _ => None, | ||
| }) | ||
| .filter(|binding| binding.param_list().is_none() && binding.name_ref().is_some()) | ||
| .nth(binding_idx as usize) | ||
| } | ||
|
|
||
| /// This function find the AST generic argument from the one in the HIR. Does not support the `Self` argument. | ||
| pub fn hir_generic_arg_to_ast( | ||
| args: &ast::GenericArgList, | ||
| arg_idx: u32, | ||
| has_self_arg: bool, | ||
| ) -> Option<ast::GenericArg> { | ||
| args.generic_args() | ||
| .filter(|arg| match arg { | ||
| ast::GenericArg::AssocTypeArg(_) => false, | ||
| ast::GenericArg::LifetimeArg(arg) => arg.lifetime().is_some(), | ||
| ast::GenericArg::ConstArg(_) | ast::GenericArg::TypeArg(_) => true, | ||
| }) | ||
| .nth(arg_idx as usize - has_self_arg as usize) | ||
| } |
There was a problem hiding this comment.
Naming nit (also the location for them seems unrelated), these don't touch anything hir related
There was a problem hiding this comment.
The hir is against the ast: it finds the AST for the HIR lowered.
Comment on lines
+11
to
+22
| let owner_description = match d.def { | ||
| hir::GenericDef::Function(_) => "function", | ||
| hir::GenericDef::Adt(hir::Adt::Struct(_)) => "struct", | ||
| hir::GenericDef::Adt(hir::Adt::Enum(_)) => "enum", | ||
| hir::GenericDef::Adt(hir::Adt::Union(_)) => "union", | ||
| hir::GenericDef::Trait(_) => "trait", | ||
| hir::GenericDef::TraitAlias(_) => "trait alias", | ||
| hir::GenericDef::TypeAlias(_) => "type alias", | ||
| hir::GenericDef::Impl(_) => "impl", | ||
| hir::GenericDef::Const(_) => "constant", | ||
| hir::GenericDef::Static(_) => "static", | ||
| }; |
There was a problem hiding this comment.
Let's extract that into a method? Seems generally useful for more diagnostics in the future
|
#19624 will probably collide with this once merged |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Also known as E0747 and E0107.
And by the way, rewrite how we lower generic arguments and deduplicate it between paths and method calls. The new version is taken almost straight from rustc.
This commit also changes the binders of
generic_defaults(), to only include the binders of the arguments up to (and not including) the current argument. This make it easier to handle it in the rewritten lowering of generic args. It's also how rustc does it.This is a step towards #17590, the next step will be to add a quickfix to the count mismatch diagnostic that adds new parameters. Since this became somewhat big I separated the steps.