From 520fb92c33e8f446349c76103da5b204ff2ad9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Thu, 9 Jul 2020 13:01:20 -0700 Subject: [PATCH] Reword incorrect `self` token suggestion --- src/librustc_resolve/late/diagnostics.rs | 4 ++-- src/test/ui/self/suggest-self.stderr | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librustc_resolve/late/diagnostics.rs b/src/librustc_resolve/late/diagnostics.rs index 1bce160acb6..e0f7a29239c 100644 --- a/src/librustc_resolve/late/diagnostics.rs +++ b/src/librustc_resolve/late/diagnostics.rs @@ -168,9 +168,9 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> { if ["this", "my"].contains(&&*item_str.as_str()) && self.self_value_is_available(path[0].ident.span, span) { - err.span_suggestion( + err.span_suggestion_short( span, - "did you mean", + "you might have meant to use `self` here instead", "self".to_string(), Applicability::MaybeIncorrect, ); diff --git a/src/test/ui/self/suggest-self.stderr b/src/test/ui/self/suggest-self.stderr index 631e43c8694..0d38b9d87c5 100644 --- a/src/test/ui/self/suggest-self.stderr +++ b/src/test/ui/self/suggest-self.stderr @@ -5,7 +5,7 @@ LL | this.x | ^^^^ | | | not found in this scope - | help: did you mean: `self` + | help: you might have meant to use `self` here instead error[E0425]: cannot find value `this` in this scope --> $DIR/suggest-self.rs:26:9 @@ -14,7 +14,7 @@ LL | this.foo() | ^^^^ | | | not found in this scope - | help: did you mean: `self` + | help: you might have meant to use `self` here instead error[E0425]: cannot find value `my` in this scope --> $DIR/suggest-self.rs:31:9 @@ -23,7 +23,7 @@ LL | my.bar() | ^^ | | | not found in this scope - | help: did you mean: `self` + | help: you might have meant to use `self` here instead error: aborting due to 3 previous errors