From 941b2e32ade695f7987c229eb1344c35119d6354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Wed, 5 Sep 2018 08:39:50 -0700
Subject: [PATCH] slight rewording of labels

---
 src/librustc_resolve/lib.rs             | 32 +++++++++++++++----------
 src/test/ui/error-codes/E0401.stderr    |  2 +-
 src/test/ui/issues/issue-12796.stderr   |  2 +-
 src/test/ui/use-self-in-inner-fn.rs     |  2 +-
 src/test/ui/use-self-in-inner-fn.stderr |  2 +-
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 19a4fdae4859..449b395c0040 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -197,15 +197,26 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver,
             err.span_label(span, "use of type variable from outer function");
 
             let cm = resolver.session.source_map();
-            let mut is_self = false;
             match outer_def {
-                Def::SelfTy(_, maybe_impl_defid) => {
-                    if let Some(impl_span) = maybe_impl_defid.map_or(None,
-                            |def_id| resolver.definitions.opt_span(def_id)) {
-                        err.span_label(reduce_impl_span_to_impl_keyword(cm, impl_span),
-                                    "`Self` type implicitly declared here, on the `impl`");
+                Def::SelfTy(maybe_trait_defid, maybe_impl_defid) => {
+                    if let Some(impl_span) = maybe_impl_defid.and_then(|def_id| {
+                        resolver.definitions.opt_span(def_id)
+                    }) {
+                        err.span_label(
+                            reduce_impl_span_to_impl_keyword(cm, impl_span),
+                            "`Self` type implicitly declared here, on the `impl`",
+                        );
                     }
-                    is_self = true;
+                    match (maybe_trait_defid, maybe_impl_defid) {
+                        (Some(_), None) => {
+                            err.span_label(span, "can't use `Self` here");
+                        }
+                        (_, Some(_)) => {
+                            err.span_label(span, "use a type here instead");
+                        }
+                        (None, None) => bug!("`impl` without trait nor type?"),
+                    }
+                    return err;
                 },
                 Def::TyParam(typaram_defid) => {
                     if let Some(typaram_span) = resolver.definitions.opt_span(typaram_defid) {
@@ -221,12 +232,7 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver,
             // Try to retrieve the span of the function signature and generate a new message with
             // a local type parameter
             let sugg_msg = "try using a local type parameter instead";
-            if is_self {
-                // Suggest using the actual type
-                err.span_label(span, "use a materialized type here instead");
-            } else if let Some(
-                (sugg_span, new_snippet),
-            ) = cm.generate_local_type_param_snippet(span) {
+            if let Some((sugg_span, new_snippet)) = cm.generate_local_type_param_snippet(span) {
                 // Suggest the modification to the user
                 err.span_suggestion_with_applicability(
                     sugg_span,
diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr
index 90e8d2d2479d..66cc8795fba2 100644
--- a/src/test/ui/error-codes/E0401.stderr
+++ b/src/test/ui/error-codes/E0401.stderr
@@ -30,7 +30,7 @@ LL |         fn helper(sel: &Self) -> u8 { //~ ERROR E0401
    |                         ^^^^
    |                         |
    |                         use of type variable from outer function
-   |                         use a materialized type here instead
+   |                         use a type here instead
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/issues/issue-12796.stderr b/src/test/ui/issues/issue-12796.stderr
index 078c1db5de59..0c369c6ab971 100644
--- a/src/test/ui/issues/issue-12796.stderr
+++ b/src/test/ui/issues/issue-12796.stderr
@@ -5,7 +5,7 @@ LL |         fn inner(_: &Self) {
    |                      ^^^^
    |                      |
    |                      use of type variable from outer function
-   |                      use a materialized type here instead
+   |                      can't use `Self` here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/use-self-in-inner-fn.rs b/src/test/ui/use-self-in-inner-fn.rs
index a1183854eb50..380cb7a2aa27 100644
--- a/src/test/ui/use-self-in-inner-fn.rs
+++ b/src/test/ui/use-self-in-inner-fn.rs
@@ -16,7 +16,7 @@ impl A {
         fn peach(this: &Self) {
         //~^ ERROR can't use type parameters from outer function
         //~| NOTE use of type variable from outer function
-        //~| NOTE use a materialized type here instead
+        //~| NOTE use a type here instead
         }
     }
 }
diff --git a/src/test/ui/use-self-in-inner-fn.stderr b/src/test/ui/use-self-in-inner-fn.stderr
index c14e4895d993..26082e5e01b2 100644
--- a/src/test/ui/use-self-in-inner-fn.stderr
+++ b/src/test/ui/use-self-in-inner-fn.stderr
@@ -8,7 +8,7 @@ LL |         fn peach(this: &Self) {
    |                         ^^^^
    |                         |
    |                         use of type variable from outer function
-   |                         use a materialized type here instead
+   |                         use a type here instead
 
 error: aborting due to previous error