nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-28 01:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect outer function type parameter message

Browse Source
This commit is contained in:
Esteban Küber 2018-09-04 10:41:33 -07:00
parent 1c2e17f4e3
commit d7a74be09b
5 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc_resolve/lib.rs
View File

@ -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,

7
src/test/ui/error-codes/E0401.stderr
View File

@ -27,9 +27,10 @@ LL | impl<T> Iterator for A<T> {
| ---- `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<Self>`
| ^^^^
| |
| use of type variable from outer function
| use a materialized type here instead
error: aborting due to 3 previous errors

7
src/test/ui/issues/issue-12796.stderr
View File

@ -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<Self>`
| ^^^^
| |
| use of type variable from outer function
| use a materialized type here instead
error: aborting due to previous error

24
src/test/ui/use-self-in-inner-fn.rs Normal file
View File

@ -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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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() {}

15
src/test/ui/use-self-in-inner-fn.stderr Normal file
View File

@ -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`.