use structured suggestions for E0432

16 files changed, 96 insertions, 48 deletions

diff --git a/src/test/ui/extenv/issue-55897.stderr b/src/test/ui/extenv/issue-55897.stderr
index 4d2e35dff46..603b29aa989 100644
--- a/src/test/ui/extenv/issue-55897.stderr
+++ b/src/test/ui/extenv/issue-55897.stderr
@@ -8,7 +8,10 @@ error[E0432]: unresolved import `prelude`
   --> $DIR/issue-55897.rs:1:5
    |
 LL | use prelude::*; //~ ERROR unresolved import `prelude`
-   |     ^^^^^^^ did you mean `std::prelude`?
+   |     ^^^^^^^
+   |     |
+   |     unresolved import
+   |     help: a similar path exists: `std::prelude`
 
 error: cannot determine resolution for the macro `env`
   --> $DIR/issue-55897.rs:6:22
diff --git a/src/test/ui/import.rs b/src/test/ui/import.rs
index 540258daaec..3170dd2fae1 100644
--- a/src/test/ui/import.rs
+++ b/src/test/ui/import.rs
@@ -1,6 +1,8 @@
 use zed::bar;
 use zed::baz; //~ ERROR unresolved import `zed::baz` [E0432]
-              //~^ no `baz` in `zed`. Did you mean to use `bar`?
+              //~| no `baz` in `zed`
+              //~| HELP a similar name exists in the module
+              //~| SUGGESTION bar
 
 
 mod zed {
diff --git a/src/test/ui/import.stderr b/src/test/ui/import.stderr
index 737d10cdecb..bfbb6560d49 100644
--- a/src/test/ui/import.stderr
+++ b/src/test/ui/import.stderr
@@ -2,16 +2,19 @@ error[E0432]: unresolved import `zed::baz`
   --> $DIR/import.rs:2:5
    |
 LL | use zed::baz; //~ ERROR unresolved import `zed::baz` [E0432]
-   |     ^^^^^^^^ no `baz` in `zed`. Did you mean to use `bar`?
+   |     ^^^^^---
+   |     |    |
+   |     |    help: a similar name exists in the module: `bar`
+   |     no `baz` in `zed`
 
 error[E0432]: unresolved import `foo`
-  --> $DIR/import.rs:8:9
+  --> $DIR/import.rs:10:9
    |
 LL |     use foo; //~ ERROR unresolved import `foo` [E0432]
    |         ^^^ no `foo` in the root
 
 error[E0603]: unresolved item `foo` is private
-  --> $DIR/import.rs:13:10
+  --> $DIR/import.rs:15:10
    |
 LL |     zed::foo(); //~ ERROR `foo` is private
    |          ^^^
diff --git a/src/test/ui/imports/issue-55457.stderr b/src/test/ui/imports/issue-55457.stderr
index 4ee0332d04b..a3474b2f7db 100644
--- a/src/test/ui/imports/issue-55457.stderr
+++ b/src/test/ui/imports/issue-55457.stderr
@@ -2,7 +2,10 @@ error[E0432]: unresolved import `NonExistent`
   --> $DIR/issue-55457.rs:1:5
    |
 LL | use NonExistent; //~ ERROR unresolved import `NonExistent`
-   |     ^^^^^^^^^^^ no `NonExistent` in the root. Did you mean to use `non_existent`?
+   |     ^^^^^^^^^^^
+   |     |
+   |     no `NonExistent` in the root
+   |     help: a similar name exists in the module: `non_existent`
 
 error[E0432]: unresolved import `non_existent`
   --> $DIR/issue-55457.rs:2:5
diff --git a/src/test/ui/inaccessible-test-modules.stderr b/src/test/ui/inaccessible-test-modules.stderr
index 636ef818705..40f2b7fd2ee 100644
--- a/src/test/ui/inaccessible-test-modules.stderr
+++ b/src/test/ui/inaccessible-test-modules.stderr
@@ -2,13 +2,19 @@ error[E0432]: unresolved import `__test`
   --> $DIR/inaccessible-test-modules.rs:5:5
    |
 LL | use __test as x; //~ ERROR unresolved import `__test`
-   |     ^^^^^^^^^^^ no `__test` in the root. Did you mean to use `test`?
+   |     ------^^^^^
+   |     |
+   |     no `__test` in the root
+   |     help: a similar name exists in the module: `test`
 
 error[E0432]: unresolved import `__test_reexports`
   --> $DIR/inaccessible-test-modules.rs:6:5
    |
 LL | use __test_reexports as y; //~ ERROR unresolved import `__test_reexports`
-   |     ^^^^^^^^^^^^^^^^^^^^^ no `__test_reexports` in the root. Did you mean to use `__test_reexports`?
+   |     ----------------^^^^^
+   |     |
+   |     no `__test_reexports` in the root
+   |     help: a similar name exists in the module: `__test_reexports`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-31212.stderr b/src/test/ui/issues/issue-31212.stderr
index d964b702f22..09300ffc787 100644
--- a/src/test/ui/issues/issue-31212.stderr
+++ b/src/test/ui/issues/issue-31212.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `self::*`
   --> $DIR/issue-31212.rs:5:13
    |
 LL |     pub use self::*; //~ ERROR unresolved
-   |             ^^^^^^^ Cannot glob-import a module into itself.
+   |             ^^^^^^^ cannot glob-import a module into itself
 
 error[E0425]: cannot find function `f` in module `foo`
   --> $DIR/issue-31212.rs:9:10
diff --git a/src/test/ui/issues/issue-8208.rs b/src/test/ui/issues/issue-8208.rs
index ad94f99098d..1c566938f9d 100644
--- a/src/test/ui/issues/issue-8208.rs
+++ b/src/test/ui/issues/issue-8208.rs
@@ -1,14 +1,14 @@
 use self::*; //~ ERROR: unresolved import `self::*` [E0432]
-             //~^ Cannot glob-import a module into itself.
+             //~^ cannot glob-import a module into itself
 
 mod foo {
     use foo::*; //~ ERROR: unresolved import `foo::*` [E0432]
-                //~^ Cannot glob-import a module into itself.
+                //~^ cannot glob-import a module into itself
 
     mod bar {
         use super::bar::*;
         //~^ ERROR: unresolved import `super::bar::*` [E0432]
-        //~| Cannot glob-import a module into itself.
+        //~| cannot glob-import a module into itself
     }
 
 }
diff --git a/src/test/ui/issues/issue-8208.stderr b/src/test/ui/issues/issue-8208.stderr
index 6de95fb953a..a042dce1ac1 100644
--- a/src/test/ui/issues/issue-8208.stderr
+++ b/src/test/ui/issues/issue-8208.stderr
@@ -2,19 +2,19 @@ error[E0432]: unresolved import `self::*`
   --> $DIR/issue-8208.rs:1:5
    |
 LL | use self::*; //~ ERROR: unresolved import `self::*` [E0432]
-   |     ^^^^^^^ Cannot glob-import a module into itself.
+   |     ^^^^^^^ cannot glob-import a module into itself
 
 error[E0432]: unresolved import `foo::*`
   --> $DIR/issue-8208.rs:5:9
    |
 LL |     use foo::*; //~ ERROR: unresolved import `foo::*` [E0432]
-   |         ^^^^^^ Cannot glob-import a module into itself.
+   |         ^^^^^^ cannot glob-import a module into itself
 
 error[E0432]: unresolved import `super::bar::*`
   --> $DIR/issue-8208.rs:9:13
    |
 LL |         use super::bar::*;
-   |             ^^^^^^^^^^^^^ Cannot glob-import a module into itself.
+   |             ^^^^^^^^^^^^^ cannot glob-import a module into itself
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/resolve_self_super_hint.rs b/src/test/ui/resolve_self_super_hint.rs
index 193a6ecf9d5..91a01cc0fa2 100644
--- a/src/test/ui/resolve_self_super_hint.rs
+++ b/src/test/ui/resolve_self_super_hint.rs
@@ -5,19 +5,23 @@ mod a {
     extern crate alloc;
     use alloc::HashMap;
     //~^ ERROR unresolved import `alloc` [E0432]
-    //~| did you mean `self::alloc`?
+    //~| HELP a similar path exists
+    //~| SUGGESTION self::alloc
     mod b {
         use alloc::HashMap;
         //~^ ERROR unresolved import `alloc` [E0432]
-        //~| did you mean `super::alloc`?
+        //~| HELP a similar path exists
+        //~| SUGGESTION super::alloc
         mod c {
             use alloc::HashMap;
             //~^ ERROR unresolved import `alloc` [E0432]
-            //~| did you mean `a::alloc`?
+            //~| HELP a similar path exists
+            //~| SUGGESTION a::alloc
             mod d {
                 use alloc::HashMap;
                 //~^ ERROR unresolved import `alloc` [E0432]
-                //~| did you mean `a::alloc`?
+                //~| HELP a similar path exists
+                //~| SUGGESTION a::alloc
             }
         }
     }
diff --git a/src/test/ui/resolve_self_super_hint.stderr b/src/test/ui/resolve_self_super_hint.stderr
index ddae0e5f6aa..03214cad8e4 100644
--- a/src/test/ui/resolve_self_super_hint.stderr
+++ b/src/test/ui/resolve_self_super_hint.stderr
@@ -2,25 +2,31 @@ error[E0432]: unresolved import `alloc`
   --> $DIR/resolve_self_super_hint.rs:6:9
    |
 LL |     use alloc::HashMap;
-   |         ^^^^^ did you mean `self::alloc`?
+   |         ^^^^^ help: a similar path exists: `self::alloc`
 
 error[E0432]: unresolved import `alloc`
-  --> $DIR/resolve_self_super_hint.rs:10:13
+  --> $DIR/resolve_self_super_hint.rs:11:13
    |
 LL |         use alloc::HashMap;
-   |             ^^^^^ did you mean `super::alloc`?
+   |             ^^^^^ help: a similar path exists: `super::alloc`
 
 error[E0432]: unresolved import `alloc`
-  --> $DIR/resolve_self_super_hint.rs:14:17
+  --> $DIR/resolve_self_super_hint.rs:16:17
    |
 LL |             use alloc::HashMap;
-   |                 ^^^^^ did you mean `a::alloc`?
+   |                 ^^^^^
+   |                 |
+   |                 unresolved import
+   |                 help: a similar path exists: `a::alloc`
 
 error[E0432]: unresolved import `alloc`
-  --> $DIR/resolve_self_super_hint.rs:18:21
+  --> $DIR/resolve_self_super_hint.rs:21:21
    |
 LL |                 use alloc::HashMap;
-   |                     ^^^^^ did you mean `a::alloc`?
+   |                     ^^^^^
+   |                     |
+   |                     unresolved import
+   |                     help: a similar path exists: `a::alloc`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/rust-2018/issue-54006.stderr b/src/test/ui/rust-2018/issue-54006.stderr
index 6c6d7720be2..1978138a688 100644
--- a/src/test/ui/rust-2018/issue-54006.stderr
+++ b/src/test/ui/rust-2018/issue-54006.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `alloc`
   --> $DIR/issue-54006.rs:6:5
    |
 LL | use alloc::vec;
-   |     ^^^^^ did you mean `core::alloc`?
+   |     ^^^^^ help: a similar path exists: `core::alloc`
 
 error: cannot determine resolution for the macro `vec`
   --> $DIR/issue-54006.rs:10:18
diff --git a/src/test/ui/rust-2018/local-path-suggestions-2015.stderr b/src/test/ui/rust-2018/local-path-suggestions-2015.stderr
index be642c3bcdc..fafb35ec50d 100644
--- a/src/test/ui/rust-2018/local-path-suggestions-2015.stderr
+++ b/src/test/ui/rust-2018/local-path-suggestions-2015.stderr
@@ -2,7 +2,10 @@ error[E0432]: unresolved import `foobar`
   --> $DIR/local-path-suggestions-2015.rs:24:5
    |
 LL | use foobar::Baz; //~ ERROR unresolved import `foobar`
-   |     ^^^^^^ did you mean `aux_baz::foobar`?
+   |     ^^^^^^
+   |     |
+   |     unresolved import
+   |     help: a similar path exists: `aux_baz::foobar`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rust-2018/local-path-suggestions-2018.stderr b/src/test/ui/rust-2018/local-path-suggestions-2018.stderr
index 71c8289264f..759977b3f06 100644
--- a/src/test/ui/rust-2018/local-path-suggestions-2018.stderr
+++ b/src/test/ui/rust-2018/local-path-suggestions-2018.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `foo`
   --> $DIR/local-path-suggestions-2018.rs:10:9
    |
 LL |     use foo::Bar; //~ ERROR unresolved import `foo`
-   |         ^^^ did you mean `crate::foo`?
+   |         ^^^ help: a similar path exists: `crate::foo`
    |
    = note: `use` statements changed in Rust 2018; read more at <https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-clarity.html>
 
@@ -10,7 +10,7 @@ error[E0432]: unresolved import `foobar`
   --> $DIR/local-path-suggestions-2018.rs:19:5
    |
 LL | use foobar::Baz; //~ ERROR unresolved import `foobar`
-   |     ^^^^^^ did you mean `baz::foobar`?
+   |     ^^^^^^ help: a similar path exists: `baz::foobar`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/unresolved/unresolved-import.rs b/src/test/ui/unresolved/unresolved-import.rs
index be2a2c75485..4c7d4bb9353 100644
--- a/src/test/ui/unresolved/unresolved-import.rs
+++ b/src/test/ui/unresolved/unresolved-import.rs
@@ -1,16 +1,20 @@
-// ignore-tidy-linelength
-
 use foo::bar; //~ ERROR unresolved import `foo` [E0432]
               //~^ maybe a missing `extern crate foo;`?
 
 use bar::Baz as x; //~ ERROR unresolved import `bar::Baz` [E0432]
-                   //~^ no `Baz` in `bar`. Did you mean to use `Bar`?
+                   //~| no `Baz` in `bar`
+                   //~| HELP a similar name exists in the module
+                   //~| SUGGESTION Bar
 
 use food::baz; //~ ERROR unresolved import `food::baz`
-               //~^ no `baz` in `food`. Did you mean to use `bag`?
+               //~| no `baz` in `food`
+               //~| HELP a similar name exists in the module
+               //~| SUGGESTION bag
 
 use food::{beens as Foo}; //~ ERROR unresolved import `food::beens` [E0432]
-                          //~^ no `beens` in `food`. Did you mean to use `beans`?
+                          //~| no `beens` in `food`
+                          //~| HELP a similar name exists in the module
+                          //~| SUGGESTION beans
 
 mod bar {
     pub struct Bar;
@@ -32,7 +36,8 @@ mod m {
     }
 
     use MyEnum::*; //~ ERROR unresolved import `MyEnum` [E0432]
-                   //~^ did you mean `self::MyEnum`?
+                   //~| HELP a similar path exists
+                   //~| SUGGESTION self::MyEnum
 }
 
 mod items {
@@ -41,7 +46,8 @@ mod items {
     }
 
     use Enum::*; //~ ERROR unresolved import `Enum` [E0432]
-                 //~^ did you mean `self::Enum`?
+                 //~| HELP a similar path exists
+                 //~| SUGGESTION self::Enum
 
     fn item() {}
 }
diff --git a/src/test/ui/unresolved/unresolved-import.stderr b/src/test/ui/unresolved/unresolved-import.stderr
index 0dc4b72208a..4f2fef938c9 100644
--- a/src/test/ui/unresolved/unresolved-import.stderr
+++ b/src/test/ui/unresolved/unresolved-import.stderr
@@ -1,38 +1,47 @@
 error[E0432]: unresolved import `foo`
-  --> $DIR/unresolved-import.rs:3:5
+  --> $DIR/unresolved-import.rs:1:5
    |
 LL | use foo::bar; //~ ERROR unresolved import `foo` [E0432]
    |     ^^^ maybe a missing `extern crate foo;`?
 
 error[E0432]: unresolved import `bar::Baz`
-  --> $DIR/unresolved-import.rs:6:5
+  --> $DIR/unresolved-import.rs:4:5
    |
 LL | use bar::Baz as x; //~ ERROR unresolved import `bar::Baz` [E0432]
-   |     ^^^^^^^^^^^^^ no `Baz` in `bar`. Did you mean to use `Bar`?
+   |     ^^^^^---^^^^^
+   |     |    |
+   |     |    help: a similar name exists in the module: `Bar`
+   |     no `Baz` in `bar`
 
 error[E0432]: unresolved import `food::baz`
   --> $DIR/unresolved-import.rs:9:5
    |
 LL | use food::baz; //~ ERROR unresolved import `food::baz`
-   |     ^^^^^^^^^ no `baz` in `food`. Did you mean to use `bag`?
+   |     ^^^^^^---
+   |     |     |
+   |     |     help: a similar name exists in the module: `bag`
+   |     no `baz` in `food`
 
 error[E0432]: unresolved import `food::beens`
-  --> $DIR/unresolved-import.rs:12:12
+  --> $DIR/unresolved-import.rs:14:12
    |
 LL | use food::{beens as Foo}; //~ ERROR unresolved import `food::beens` [E0432]
-   |            ^^^^^^^^^^^^ no `beens` in `food`. Did you mean to use `beans`?
+   |            -----^^^^^^^
+   |            |
+   |            no `beens` in `food`
+   |            help: a similar name exists in the module: `beans`
 
 error[E0432]: unresolved import `MyEnum`
-  --> $DIR/unresolved-import.rs:34:9
+  --> $DIR/unresolved-import.rs:38:9
    |
 LL |     use MyEnum::*; //~ ERROR unresolved import `MyEnum` [E0432]
-   |         ^^^^^^ did you mean `self::MyEnum`?
+   |         ^^^^^^ help: a similar path exists: `self::MyEnum`
 
 error[E0432]: unresolved import `Enum`
-  --> $DIR/unresolved-import.rs:43:9
+  --> $DIR/unresolved-import.rs:48:9
    |
 LL |     use Enum::*; //~ ERROR unresolved import `Enum` [E0432]
-   |         ^^^^ did you mean `self::Enum`?
+   |         ^^^^ help: a similar path exists: `self::Enum`
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/use/use-nested-groups-error.stderr b/src/test/ui/use/use-nested-groups-error.stderr
index 9d6fd9df6cb..7234c8ec621 100644
--- a/src/test/ui/use/use-nested-groups-error.stderr
+++ b/src/test/ui/use/use-nested-groups-error.stderr
@@ -2,7 +2,10 @@ error[E0432]: unresolved import `a::b1::C1`
   --> $DIR/use-nested-groups-error.rs:9:14
    |
 LL | use a::{b1::{C1, C2}, B2};
-   |              ^^ no `C1` in `a::b1`. Did you mean to use `C2`?
+   |              ^^
+   |              |
+   |              no `C1` in `a::b1`
+   |              help: a similar name exists in the module: `C2`
 
 error: aborting due to previous error