From cae164c02c6d6b66f4a34b572bcff0612929ce96 Mon Sep 17 00:00:00 2001 From: csmoe <35686186+csmoe@users.noreply.github.com> Date: Sun, 30 Sep 2018 19:09:34 +0800 Subject: [PATCH 1/4] add test for fake self --- src/test/ui/self/suggest-self.rs | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/test/ui/self/suggest-self.rs diff --git a/src/test/ui/self/suggest-self.rs b/src/test/ui/self/suggest-self.rs new file mode 100644 index 0000000000000..56ba7ff8fe1e3 --- /dev/null +++ b/src/test/ui/self/suggest-self.rs @@ -0,0 +1,38 @@ +// 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 Foo { + x: i32, +} + +impl Foo { + fn foo(&self) -> i32 { + this.x + //~^ ERROR cannot find value `this` in this scope + } + + fn bar(&self) -> i32 { + this.foo() + //~^ ERROR cannot find value `this` in this scope + } + + fn baz(&self) -> i32 { + my.bar() + //~^ ERROR cannot find value `this` in this scope + } +} + +fn main() { + let this = vec![1, 2, 3]; + let my = vec![1, 2, 3]; + let len = this.len(); + let len = my.len(); +} + From 99edcd4da77855d5ad2d439293e0789715f32ca0 Mon Sep 17 00:00:00 2001 From: csmoe <35686186+csmoe@users.noreply.github.com> Date: Sun, 30 Sep 2018 20:47:15 +0800 Subject: [PATCH 2/4] lint to use self for this/my --- src/librustc_resolve/lib.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index a68c89deea5b6..99ce351cbcf72 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -2981,13 +2981,13 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> { // Make the base error. let expected = source.descr_expected(); let path_str = names_to_string(path); + let item_str = path[path.len() - 1]; let code = source.error_code(def.is_some()); let (base_msg, fallback_label, base_span) = if let Some(def) = def { (format!("expected {}, found {} `{}`", expected, def.kind_name(), path_str), format!("not a {}", expected), span) } else { - let item_str = path[path.len() - 1]; let item_span = path[path.len() - 1].span; let (mod_prefix, mod_str) = if path.len() == 1 { (String::new(), "this scope".to_string()) @@ -3010,6 +3010,20 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> { let code = DiagnosticId::Error(code.into()); let mut err = this.session.struct_span_err_with_code(base_span, &base_msg, code); + // Emit help message for fake-self from other languages like `this`(javascript) + let fake_self: Vec = ["this", "my"].iter().map( + |s| Ident::from_str(*s) + ).collect(); + if fake_self.contains(&item_str) + && this.self_value_is_available(path[0].span, span) { + err.span_suggestion_with_applicability( + span, + "did you mean", + "self".to_string(), + Applicability::MachineApplicable, + ); + } + // Emit special messages for unresolved `Self` and `self`. if is_self_type(path, ns) { __diagnostic_used!(E0411); From 912691b3ff95195481e5cf3a31836fc8d55288c9 Mon Sep 17 00:00:00 2001 From: csmoe <35686186+csmoe@users.noreply.github.com> Date: Sun, 30 Sep 2018 20:48:28 +0800 Subject: [PATCH 3/4] update ui test for suggest-self --- src/test/ui/self/suggest-self.rs | 16 ++++++++++++++- src/test/ui/self/suggest-self.stderr | 30 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 src/test/ui/self/suggest-self.stderr diff --git a/src/test/ui/self/suggest-self.rs b/src/test/ui/self/suggest-self.rs index 56ba7ff8fe1e3..f648d781cafea 100644 --- a/src/test/ui/self/suggest-self.rs +++ b/src/test/ui/self/suggest-self.rs @@ -13,6 +13,20 @@ struct Foo { } impl Foo { + fn this1(&self) -> i32 { + let this = self; + let a = 1; + this.x + } + + fn this2(&self) -> i32 { + let a = Foo { + x: 2 + }; + let this = a; + this.x + } + fn foo(&self) -> i32 { this.x //~^ ERROR cannot find value `this` in this scope @@ -25,7 +39,7 @@ impl Foo { fn baz(&self) -> i32 { my.bar() - //~^ ERROR cannot find value `this` in this scope + //~^ ERROR cannot find value `my` in this scope } } diff --git a/src/test/ui/self/suggest-self.stderr b/src/test/ui/self/suggest-self.stderr new file mode 100644 index 0000000000000..04d7622e3c807 --- /dev/null +++ b/src/test/ui/self/suggest-self.stderr @@ -0,0 +1,30 @@ +error[E0425]: cannot find value `this` in this scope + --> $DIR/suggest-self.rs:31:9 + | +LL | this.x + | ^^^^ + | | + | not found in this scope + | help: do you mean: `self` + +error[E0425]: cannot find value `this` in this scope + --> $DIR/suggest-self.rs:36:9 + | +LL | this.foo() + | ^^^^ + | | + | not found in this scope + | help: do you mean: `self` + +error[E0425]: cannot find value `my` in this scope + --> $DIR/suggest-self.rs:41:9 + | +LL | my.bar() + | ^^ + | | + | not found in this scope + | help: do you mean: `self` + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0425`. From 4470b1cec0a5b8eb580a8cce96009a46f54bf2c2 Mon Sep 17 00:00:00 2001 From: csmoe <35686186+csmoe@users.noreply.github.com> Date: Mon, 1 Oct 2018 09:08:26 +0800 Subject: [PATCH 4/4] mark fix as MaybeIncorrect --- src/librustc_resolve/lib.rs | 2 +- src/test/ui/self/suggest-self.stderr | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 99ce351cbcf72..09ac24a33faff 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -3020,7 +3020,7 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> { span, "did you mean", "self".to_string(), - Applicability::MachineApplicable, + Applicability::MaybeIncorrect, ); } diff --git a/src/test/ui/self/suggest-self.stderr b/src/test/ui/self/suggest-self.stderr index 04d7622e3c807..9035dc0fe7d29 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: do you mean: `self` + | help: did you mean: `self` error[E0425]: cannot find value `this` in this scope --> $DIR/suggest-self.rs:36:9 @@ -14,7 +14,7 @@ LL | this.foo() | ^^^^ | | | not found in this scope - | help: do you mean: `self` + | help: did you mean: `self` error[E0425]: cannot find value `my` in this scope --> $DIR/suggest-self.rs:41:9 @@ -23,7 +23,7 @@ LL | my.bar() | ^^ | | | not found in this scope - | help: do you mean: `self` + | help: did you mean: `self` error: aborting due to 3 previous errors