Tweak wording and logic

estebank · estebank · commit ac5e18756a4f · 2023-09-23T01:54:05.000Z
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -243,15 +243,20 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                             ));
                             None
                         }
-                        AssocItemKind::Fn(fn_) => Some((
+                        AssocItemKind::Fn(fn_) if fn_.sig.decl.has_self() => Some((
                             sp,
-                            "consider using the associated function",
-                            if fn_.sig.decl.has_self() { "self." } else { "Self::" },
+                            "consider using the method on `Self`",
+                            "self.".to_string(),
+                        )),
+                        AssocItemKind::Fn(_) => Some((
+                            sp,
+                            "consider using the associated function on `Self`",
+                            "Self::".to_string(),
                         )),
                         AssocItemKind::Const(..) => Some((
                             sp,
-                            "consider using the associated constant",
-                            "Self::",
+                            "consider using the associated constant on `Self`",
+                            "Self::".to_string(),
                         )),
                         _ => None
                     }
diff --git a/tests/ui/resolve/issue-103474.stderr b/tests/ui/resolve/issue-103474.stderr
@@ -19,7 +19,7 @@ error[E0425]: cannot find function `first` in this scope
 LL |         first()
    |         ^^^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the method on `Self`
    |
 LL |         self.first()
    |         +++++
diff --git a/tests/ui/resolve/issue-2356.stderr b/tests/ui/resolve/issue-2356.stderr
@@ -73,7 +73,7 @@ error[E0425]: cannot find function `static_method` in this scope
 LL |         static_method();
    |         ^^^^^^^^^^^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the associated function on `Self`
    |
 LL |         Self::static_method();
    |         ++++++
@@ -102,7 +102,7 @@ error[E0425]: cannot find function `grow_older` in this scope
 LL |     grow_older();
    |     ^^^^^^^^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the associated function on `Self`
    |
 LL |     Self::grow_older();
    |     ++++++
diff --git a/tests/ui/self/class-missing-self.stderr b/tests/ui/self/class-missing-self.stderr
@@ -10,7 +10,7 @@ error[E0425]: cannot find function `sleep` in this scope
 LL |       sleep();
    |       ^^^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the method on `Self`
    |
 LL |       self.sleep();
    |       +++++
diff --git a/tests/ui/suggestions/assoc-const-without-self.stderr b/tests/ui/suggestions/assoc-const-without-self.stderr
@@ -4,7 +4,7 @@ error[E0425]: cannot find value `A_CONST` in this scope
 LL |         A_CONST
    |         ^^^^^^^ not found in this scope
    |
-help: consider using the associated constant
+help: consider using the associated constant on `Self`
    |
 LL |         Self::A_CONST
    |         ++++++
diff --git a/tests/ui/suggestions/assoc_fn_without_self.stderr b/tests/ui/suggestions/assoc_fn_without_self.stderr
@@ -4,7 +4,7 @@ error[E0425]: cannot find function `foo` in this scope
 LL |         foo();
    |         ^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the associated function on `Self`
    |
 LL |         Self::foo();
    |         ++++++
@@ -24,7 +24,7 @@ error[E0425]: cannot find function `baz` in this scope
 LL |         baz(2, 3);
    |         ^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the associated function on `Self`
    |
 LL |         Self::baz(2, 3);
    |         ++++++
@@ -41,7 +41,7 @@ error[E0425]: cannot find function `foo` in this scope
 LL |         foo();
    |         ^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the associated function on `Self`
    |
 LL |         Self::foo();
    |         ++++++
@@ -52,7 +52,7 @@ error[E0425]: cannot find function `bar` in this scope
 LL |         bar();
    |         ^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the method on `Self`
    |
 LL |         self.bar();
    |         +++++
@@ -63,7 +63,7 @@ error[E0425]: cannot find function `baz` in this scope
 LL |         baz(2, 3);
    |         ^^^ not found in this scope
    |
-help: consider using the associated function
+help: consider using the associated function on `Self`
    |
 LL |         Self::baz(2, 3);
    |         ++++++

Original file line number	Diff line number	Diff line change
@@ -19,7 +19,7 @@ error[E0425]: cannot find function `first` in this scope
`19`	`19`	`LL \| first()`
`20`	`20`	`\| ^^^^^ not found in this scope`
`21`	`21`	`\|`
`22`		`-help: consider using the associated function`
	`22`	+help: consider using the method on `Self`
`23`	`23`	`\|`
`24`	`24`	`LL \| self.first()`
`25`	`25`	`\| +++++`
Original file line number	Diff line number	Diff line change
@@ -73,7 +73,7 @@ error[E0425]: cannot find function `static_method` in this scope
`73`	`73`	`LL \| static_method();`
`74`	`74`	`\| ^^^^^^^^^^^^^ not found in this scope`
`75`	`75`	`\|`
`76`		`-help: consider using the associated function`
	`76`	+help: consider using the associated function on `Self`
`77`	`77`	`\|`
`78`	`78`	`LL \| Self::static_method();`
`79`	`79`	`\| ++++++`
@@ -102,7 +102,7 @@ error[E0425]: cannot find function `grow_older` in this scope
`102`	`102`	`LL \| grow_older();`
`103`	`103`	`\| ^^^^^^^^^^ not found in this scope`
`104`	`104`	`\|`
`105`		`-help: consider using the associated function`
	`105`	+help: consider using the associated function on `Self`
`106`	`106`	`\|`
`107`	`107`	`LL \| Self::grow_older();`
`108`	`108`	`\| ++++++`
Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ error[E0425]: cannot find function `sleep` in this scope
`10`	`10`	`LL \| sleep();`
`11`	`11`	`\| ^^^^^ not found in this scope`
`12`	`12`	`\|`
`13`		`-help: consider using the associated function`
	`13`	+help: consider using the method on `Self`
`14`	`14`	`\|`
`15`	`15`	`LL \| self.sleep();`
`16`	`16`	`\| +++++`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0425]: cannot find value `A_CONST` in this scope
`4`	`4`	`LL \| A_CONST`
`5`	`5`	`\| ^^^^^^^ not found in this scope`
`6`	`6`	`\|`
`7`		`-help: consider using the associated constant`
	`7`	+help: consider using the associated constant on `Self`
`8`	`8`	`\|`
`9`	`9`	`LL \| Self::A_CONST`
`10`	`10`	`\| ++++++`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0425]: cannot find function `foo` in this scope
`4`	`4`	`LL \| foo();`
`5`	`5`	`\| ^^^ not found in this scope`
`6`	`6`	`\|`
`7`		`-help: consider using the associated function`
	`7`	+help: consider using the associated function on `Self`
`8`	`8`	`\|`
`9`	`9`	`LL \| Self::foo();`
`10`	`10`	`\| ++++++`
@@ -24,7 +24,7 @@ error[E0425]: cannot find function `baz` in this scope
`24`	`24`	`LL \| baz(2, 3);`
`25`	`25`	`\| ^^^ not found in this scope`
`26`	`26`	`\|`
`27`		`-help: consider using the associated function`
	`27`	+help: consider using the associated function on `Self`
`28`	`28`	`\|`
`29`	`29`	`LL \| Self::baz(2, 3);`
`30`	`30`	`\| ++++++`
@@ -41,7 +41,7 @@ error[E0425]: cannot find function `foo` in this scope
`41`	`41`	`LL \| foo();`
`42`	`42`	`\| ^^^ not found in this scope`
`43`	`43`	`\|`
`44`		`-help: consider using the associated function`
	`44`	+help: consider using the associated function on `Self`
`45`	`45`	`\|`
`46`	`46`	`LL \| Self::foo();`
`47`	`47`	`\| ++++++`
@@ -52,7 +52,7 @@ error[E0425]: cannot find function `bar` in this scope
`52`	`52`	`LL \| bar();`
`53`	`53`	`\| ^^^ not found in this scope`
`54`	`54`	`\|`
`55`		`-help: consider using the associated function`
	`55`	+help: consider using the method on `Self`
`56`	`56`	`\|`
`57`	`57`	`LL \| self.bar();`
`58`	`58`	`\| +++++`
@@ -63,7 +63,7 @@ error[E0425]: cannot find function `baz` in this scope
`63`	`63`	`LL \| baz(2, 3);`
`64`	`64`	`\| ^^^ not found in this scope`
`65`	`65`	`\|`
`66`		`-help: consider using the associated function`
	`66`	+help: consider using the associated function on `Self`
`67`	`67`	`\|`
`68`	`68`	`LL \| Self::baz(2, 3);`
`69`	`69`	`\| ++++++`