From d7a74be09b3c3d5ad015be31c51208260aa85007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Tue, 4 Sep 2018 10:41:33 -0700 Subject: [PATCH 1/3] Fix incorrect outer function type parameter message --- src/librustc_resolve/lib.rs | 9 ++++++++- src/test/ui/error-codes/E0401.stderr | 7 ++++--- src/test/ui/issues/issue-12796.stderr | 7 ++++--- src/test/ui/use-self-in-inner-fn.rs | 24 ++++++++++++++++++++++++ src/test/ui/use-self-in-inner-fn.stderr | 15 +++++++++++++++ 5 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 src/test/ui/use-self-in-inner-fn.rs create mode 100644 src/test/ui/use-self-in-inner-fn.stderr diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 0f6a974230917..19a4fdae48596 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -197,6 +197,7 @@ 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, @@ -204,6 +205,7 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver, err.span_label(reduce_impl_span_to_impl_keyword(cm, impl_span), "`Self` type implicitly declared here, on the `impl`"); } + is_self = true; }, Def::TyParam(typaram_defid) => { if let Some(typaram_span) = resolver.definitions.opt_span(typaram_defid) { @@ -219,7 +221,12 @@ 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 let Some((sugg_span, new_snippet)) = cm.generate_local_type_param_snippet(span) { + 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) { // 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 b088e8330e998..90e8d2d2479da 100644 --- a/src/test/ui/error-codes/E0401.stderr +++ b/src/test/ui/error-codes/E0401.stderr @@ -27,9 +27,10 @@ LL | impl Iterator for A { | ---- `Self` type implicitly declared here, on the `impl` ... LL | fn helper(sel: &Self) -> u8 { //~ ERROR E0401 - | ------ ^^^^ use of type variable from outer function - | | - | help: try using a local type parameter instead: `helper` + | ^^^^ + | | + | use of type variable from outer function + | use a materialized 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 c8bedd3853c68..078c1db5de594 100644 --- a/src/test/ui/issues/issue-12796.stderr +++ b/src/test/ui/issues/issue-12796.stderr @@ -2,9 +2,10 @@ error[E0401]: can't use type parameters from outer function --> $DIR/issue-12796.rs:13:22 | LL | fn inner(_: &Self) { - | ----- ^^^^ use of type variable from outer function - | | - | help: try using a local type parameter instead: `inner` + | ^^^^ + | | + | use of type variable from outer function + | use a materialized type here instead 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 new file mode 100644 index 0000000000000..a1183854eb50a --- /dev/null +++ b/src/test/ui/use-self-in-inner-fn.rs @@ -0,0 +1,24 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +struct A; + +impl A { +//~^ NOTE `Self` type implicitly declared here, on the `impl` + fn banana(&mut self) { + 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 + } + } +} + +fn main() {} diff --git a/src/test/ui/use-self-in-inner-fn.stderr b/src/test/ui/use-self-in-inner-fn.stderr new file mode 100644 index 0000000000000..c14e4895d9930 --- /dev/null +++ b/src/test/ui/use-self-in-inner-fn.stderr @@ -0,0 +1,15 @@ +error[E0401]: can't use type parameters from outer function + --> $DIR/use-self-in-inner-fn.rs:16:25 + | +LL | impl A { + | ---- `Self` type implicitly declared here, on the `impl` +... +LL | fn peach(this: &Self) { + | ^^^^ + | | + | use of type variable from outer function + | use a materialized type here instead + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0401`. From 941b2e32ade695f7987c229eb1344c35119d6354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Wed, 5 Sep 2018 08:39:50 -0700 Subject: [PATCH 2/3] 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 19a4fdae48596..449b395c00401 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`", + ); + } + 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?"), } - is_self = true; + 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 90e8d2d2479da..66cc8795fba20 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 078c1db5de594..0c369c6ab9717 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 a1183854eb50a..380cb7a2aa270 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 c14e4895d9930..26082e5e01b22 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 From bebecf850ab2a8c9df298bd3ab3b12ca8ea83c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Wed, 5 Sep 2018 09:56:01 -0700 Subject: [PATCH 3/3] reword label as per review --- src/librustc_resolve/lib.rs | 2 +- src/test/ui/error-codes/E0401.stderr | 2 +- src/test/ui/use-self-in-inner-fn.rs | 2 +- src/test/ui/use-self-in-inner-fn.stderr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 449b395c00401..f5ac0a6647bda 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -204,7 +204,7 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver, }) { err.span_label( reduce_impl_span_to_impl_keyword(cm, impl_span), - "`Self` type implicitly declared here, on the `impl`", + "`Self` type implicitly declared here, by this `impl`", ); } match (maybe_trait_defid, maybe_impl_defid) { diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr index 66cc8795fba20..53eeb3e9c1337 100644 --- a/src/test/ui/error-codes/E0401.stderr +++ b/src/test/ui/error-codes/E0401.stderr @@ -24,7 +24,7 @@ error[E0401]: can't use type parameters from outer function --> $DIR/E0401.rs:32:25 | LL | impl Iterator for A { - | ---- `Self` type implicitly declared here, on the `impl` + | ---- `Self` type implicitly declared here, by this `impl` ... LL | fn helper(sel: &Self) -> u8 { //~ ERROR E0401 | ^^^^ diff --git a/src/test/ui/use-self-in-inner-fn.rs b/src/test/ui/use-self-in-inner-fn.rs index 380cb7a2aa270..fea6958d7eb09 100644 --- a/src/test/ui/use-self-in-inner-fn.rs +++ b/src/test/ui/use-self-in-inner-fn.rs @@ -11,7 +11,7 @@ struct A; impl A { -//~^ NOTE `Self` type implicitly declared here, on the `impl` +//~^ NOTE `Self` type implicitly declared here, by this `impl` fn banana(&mut self) { fn peach(this: &Self) { //~^ ERROR can't use type parameters from outer function diff --git a/src/test/ui/use-self-in-inner-fn.stderr b/src/test/ui/use-self-in-inner-fn.stderr index 26082e5e01b22..cef030aec460c 100644 --- a/src/test/ui/use-self-in-inner-fn.stderr +++ b/src/test/ui/use-self-in-inner-fn.stderr @@ -2,7 +2,7 @@ error[E0401]: can't use type parameters from outer function --> $DIR/use-self-in-inner-fn.rs:16:25 | LL | impl A { - | ---- `Self` type implicitly declared here, on the `impl` + | ---- `Self` type implicitly declared here, by this `impl` ... LL | fn peach(this: &Self) { | ^^^^