bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Alter wording for use foo::self help

Browse source
This commit is contained in:
mibac138 2020-05-19 22:12:41 +02:00
parent d190e10f74
commit aaeea7ffc3
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_resolve/diagnostics.rs
View file

@ -316,7 +316,7 @@ impl<'a> Resolver<'a> {
// use foo::bar::self as abc -> foo::bar as abc // use foo::bar::self as abc -> foo::bar as abc
err.span_suggestion( err.span_suggestion(
span, span,
"Remove `::self`..", "consider importing the module directly",
"".to_string(), "".to_string(),
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
@ -328,7 +328,7 @@ impl<'a> Resolver<'a> {
(span_with_rename.shrink_to_hi(), "}".to_string()), (span_with_rename.shrink_to_hi(), "}".to_string()),
]; ];
err.multipart_suggestion( err.multipart_suggestion(
"..or add braces around `self`", "alternatively, use the multi-path `use` syntax to import `self`",
braces, braces,
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );

4
src/test/ui/error-codes/E0429.stderr
View file

@ -4,11 +4,11 @@ error[E0429]: `self` imports are only allowed within a { } list
LL | use std::fmt::self; LL | use std::fmt::self;
| ^^^^^^ | ^^^^^^
| |
help: Remove `::self`.. help: consider importing the module directly
| |
LL | use std::fmt; LL | use std::fmt;
| -- | --
help: ..or add braces around `self` help: alternatively, use the multi-path `use` syntax to import `self`
| |
LL | use std::fmt::{self}; LL | use std::fmt::{self};
| ^ ^ | ^ ^

4
src/test/ui/issues/issue-45829/import-self.stderr
View file

@ -10,11 +10,11 @@ error[E0429]: `self` imports are only allowed within a { } list
LL | use foo::self; LL | use foo::self;
| ^^^^^^ | ^^^^^^
| |
help: Remove `::self`.. help: consider importing the module directly
| |
LL | use foo; LL | use foo;
| -- | --
help: ..or add braces around `self` help: alternatively, use the multi-path `use` syntax to import `self`
| |
LL | use foo::{self}; LL | use foo::{self};
| ^ ^ | ^ ^

8
src/test/ui/use/use-mod/use-mod-4.stderr
View file

@ -4,11 +4,11 @@ error[E0429]: `self` imports are only allowed within a { } list
LL | use foo::self; LL | use foo::self;
| ^^^^^^ | ^^^^^^
| |
help: Remove `::self`.. help: consider importing the module directly
| |
LL | use foo; LL | use foo;
| -- | --
help: ..or add braces around `self` help: alternatively, use the multi-path `use` syntax to import `self`
| |
LL | use foo::{self}; LL | use foo::{self};
| ^ ^ | ^ ^
@ -19,11 +19,11 @@ error[E0429]: `self` imports are only allowed within a { } list
LL | use std::mem::self; LL | use std::mem::self;
| ^^^^^^ | ^^^^^^
| |
help: Remove `::self`.. help: consider importing the module directly
| |
LL | use std::mem; LL | use std::mem;
| -- | --
help: ..or add braces around `self` help: alternatively, use the multi-path `use` syntax to import `self`
| |
LL | use std::mem::{self}; LL | use std::mem::{self};
| ^ ^ | ^ ^

4
src/test/ui/use/use-mod/use-mod-5.stderr
View file

@ -4,11 +4,11 @@ error[E0429]: `self` imports are only allowed within a { } list
LL | use foo::bar::self; LL | use foo::bar::self;
| ^^^^^^ | ^^^^^^
| |
help: Remove `::self`.. help: consider importing the module directly
| |
LL | use foo::bar; LL | use foo::bar;
| -- | --
help: ..or add braces around `self` help: alternatively, use the multi-path `use` syntax to import `self`
| |
LL | use foo::bar::{self}; LL | use foo::bar::{self};
| ^ ^ | ^ ^

4
src/test/ui/use/use-mod/use-mod-6.stderr
View file

@ -4,11 +4,11 @@ error[E0429]: `self` imports are only allowed within a { } list
LL | use foo::bar::self as abc; LL | use foo::bar::self as abc;
| ^^^^^^ | ^^^^^^
| |
help: Remove `::self`.. help: consider importing the module directly
| |
LL | use foo::bar as abc; LL | use foo::bar as abc;
| -- | --
help: ..or add braces around `self` help: alternatively, use the multi-path `use` syntax to import `self`
| |
LL | use foo::bar::{self as abc}; LL | use foo::bar::{self as abc};
| ^ ^ | ^ ^