diff options
| author | bors <bors@rust-lang.org> | 2016-03-20 04:18:13 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-20 04:18:13 -0700 |
| commit | 173676efdc8a9f1f2a86d37c08a104e2e505f9e4 (patch) | |
| tree | 6b6921e750f62bb140f3cdb79eab702f2055ea0b | |
| parent | 015d3b70929a31af48d056a8e05d113e362339e9 (diff) | |
| parent | 63b66bfbcdec1208998dae83d26a3b4d808551d8 (diff) | |
| download | rust-173676efdc8a9f1f2a86d37c08a104e2e505f9e4.tar.gz rust-173676efdc8a9f1f2a86d37c08a104e2e505f9e4.zip | |
Auto merge of #32367 - tiehuis:tiehuis-E0412-help, r=nagisa
Alter E0412 help message wording The initial wording does not make sense due to an extra 'to'. There are two potential candidates we can change this to: - 'you can import it into scope' - 'to import it into scope' In keeping the changes minimal, we choose the first, as this is more in line with the grammar of the extended candidates help message.
| -rw-r--r-- | src/librustc_resolve/lib.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-21221-2.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-21221-3.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-21221-4.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 6313d7b7036..9d09e8d1eb1 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -3625,7 +3625,7 @@ fn show_candidates(session: &mut DiagnosticBuilder, if paths.len() == 1 { session.fileline_help( span, - &format!("you can to import it into scope: `use {};`.", + &format!("you can import it into scope: `use {};`.", &path_strings[0]), ); } else { diff --git a/src/test/compile-fail/issue-21221-2.rs b/src/test/compile-fail/issue-21221-2.rs index f031b62214d..cf5c6e8a3b4 100644 --- a/src/test/compile-fail/issue-21221-2.rs +++ b/src/test/compile-fail/issue-21221-2.rs @@ -27,5 +27,5 @@ pub mod baz { struct Foo; impl T for Foo { } //~^ ERROR trait `T` is not in scope -//~| HELP you can to import it into scope: `use foo::bar::T;`. +//~| HELP you can import it into scope: `use foo::bar::T;`. //~| HELP run `rustc --explain E0405` to see a detailed explanation diff --git a/src/test/compile-fail/issue-21221-3.rs b/src/test/compile-fail/issue-21221-3.rs index eee2c016451..a1a712d1421 100644 --- a/src/test/compile-fail/issue-21221-3.rs +++ b/src/test/compile-fail/issue-21221-3.rs @@ -24,7 +24,7 @@ struct Foo; // are hidden from the view. impl OuterTrait for Foo {} //~^ ERROR trait `OuterTrait` is not in scope -//~| HELP you can to import it into scope: `use issue_21221_3::outer::OuterTrait;`. +//~| HELP you can import it into scope: `use issue_21221_3::outer::OuterTrait;`. //~| HELP run `rustc --explain E0405` to see a detailed explanation fn main() { println!("Hello, world!"); diff --git a/src/test/compile-fail/issue-21221-4.rs b/src/test/compile-fail/issue-21221-4.rs index 6a76264dff7..1ef205bd8be 100644 --- a/src/test/compile-fail/issue-21221-4.rs +++ b/src/test/compile-fail/issue-21221-4.rs @@ -19,7 +19,7 @@ struct Foo; impl T for Foo {} //~^ ERROR trait `T` is not in scope -//~| HELP you can to import it into scope: `use issue_21221_4::T;`. +//~| HELP you can import it into scope: `use issue_21221_4::T;`. //~| HELP run `rustc --explain E0405` to see a detailed explanation fn main() { |