Alter wording for use foo::self help

rust-lang · May 19, 2020 · aaeea7f · aaeea7f
1 parent d190e10
commit aaeea7f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
@@ -316,7 +316,7 @@ impl<'a> Resolver<'a> {
  // use foo::bar::self as abc -> foo::bar as abc
  err.span_suggestion(
  span,
- "Remove `::self`..",
+ "consider importing the module directly",
  "".to_string(),
  Applicability::MachineApplicable,
  );
@@ -328,7 +328,7 @@ impl<'a> Resolver<'a> {
  (span_with_rename.shrink_to_hi(), "}".to_string()),
  ];
  err.multipart_suggestion(
- "..or add braces around `self`",
+ "alternatively, use the multi-path `use` syntax to import `self`",
  braces,
  Applicability::MachineApplicable,
  );

diff --git a/src/test/ui/error-codes/E0429.stderr b/src/test/ui/error-codes/E0429.stderr
@@ -4,11 +4,11 @@ error[E0429]: `self` imports are only allowed within a { } list
 LL | use std::fmt::self;
  | ^^^^^^
  |
-help: Remove `::self`..
+help: consider importing the module directly
  |
 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};
  | ^ ^

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

diff --git a/src/test/ui/use/use-mod/use-mod-4.stderr b/src/test/ui/use/use-mod/use-mod-4.stderr
@@ -4,11 +4,11 @@ error[E0429]: `self` imports are only allowed within a { } list
 LL | use foo::self;
  | ^^^^^^
  |
-help: Remove `::self`..
+help: consider importing the module directly
  |
 LL | use foo;
  | --
-help: ..or add braces around `self`
+help: alternatively, use the multi-path `use` syntax to import `self`
  |
 LL | use foo::{self};
  | ^ ^
@@ -19,11 +19,11 @@ error[E0429]: `self` imports are only allowed within a { } list
 LL | use std::mem::self;
  | ^^^^^^
  |
-help: Remove `::self`..
+help: consider importing the module directly
  |
 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};
  | ^ ^

diff --git a/src/test/ui/use/use-mod/use-mod-5.stderr b/src/test/ui/use/use-mod/use-mod-5.stderr
@@ -4,11 +4,11 @@ error[E0429]: `self` imports are only allowed within a { } list
 LL | use foo::bar::self;
  | ^^^^^^
  |
-help: Remove `::self`..
+help: consider importing the module directly
  |
 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};
  | ^ ^

diff --git a/src/test/ui/use/use-mod/use-mod-6.stderr b/src/test/ui/use/use-mod/use-mod-6.stderr
@@ -4,11 +4,11 @@ error[E0429]: `self` imports are only allowed within a { } list
 LL | use foo::bar::self as abc;
  | ^^^^^^
  |
-help: Remove `::self`..
+help: consider importing the module directly
  |
 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};
  | ^ ^