bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Suggest adding a type parameter for impls

Browse source
This commit is contained in:
mibac138 2021-05-05 18:59:37 +02:00
parent 24acc388da
commit 693e9579bc
4 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_resolve/src/late/diagnostics.rs
View file

@ -1600,8 +1600,8 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
if !self.diagnostic_metadata.currently_processing_generics && !single_uppercase_char {
return None;
}
match (self.diagnostic_metadata.current_item, single_uppercase_char) {
(Some(Item { kind: ItemKind::Fn(..), ident, .. }), _) if ident.name == sym::main => {
match (self.diagnostic_metadata.current_item, single_uppercase_char, self.diagnostic_metadata.currently_processing_generics) {
(Some(Item { kind: ItemKind::Fn(..), ident, .. }), _, _) if ident.name == sym::main => {
// Ignore `fn main()` as we don't want to suggest `fn main<T>()`
}
(
@ -1613,9 +1613,11 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
| kind @ ItemKind::Union(..),
..
}),
true,
true, _
)
| (Some(Item { kind, .. }), false) => {
// Without the 2nd `true`, we'd suggest `impl <T>` for `impl T` when a type `T` isn't found
| (Some(Item { kind: kind @ ItemKind::Impl(..), .. }), true, true)
| (Some(Item { kind, .. }), false, _) => {
// Likely missing type parameter.
if let Some(generics) = kind.generics() {
if span.overlaps(generics.span) {