Update ui tests output

Author: oli-obk

src/test/ui-fulldeps/resolve-error.stderr

@@ -1,76 +1,62 @@
 error: cannot find derive macro `FooWithLongNan` in this scope
-  --> $DIR/resolve-error.rs:36:10
+  --> $DIR/resolve-error.rs:37:10
    |
-36 | #[derive(FooWithLongNan)]
-   |          ^^^^^^^^^^^^^^
-   |
-   = help: did you mean `FooWithLongName`?
+37 | #[derive(FooWithLongNan)]
+   |          ^^^^^^^^^^^^^^ help: try: `FooWithLongName`
 
 error: cannot find attribute macro `attr_proc_macra` in this scope
-  --> $DIR/resolve-error.rs:39:3
-   |
-39 | #[attr_proc_macra]
-   |   ^^^^^^^^^^^^^^^
+  --> $DIR/resolve-error.rs:40:3
    |
-   = help: did you mean `attr_proc_macro`?
+40 | #[attr_proc_macra]
+   |   ^^^^^^^^^^^^^^^ help: try: `attr_proc_macro`
 
 error: cannot find attribute macro `FooWithLongNan` in this scope
-  --> $DIR/resolve-error.rs:42:3
+  --> $DIR/resolve-error.rs:43:3
    |
-42 | #[FooWithLongNan]
+43 | #[FooWithLongNan]
    |   ^^^^^^^^^^^^^^
 
 error: cannot find derive macro `Dlone` in this scope
-  --> $DIR/resolve-error.rs:45:10
+  --> $DIR/resolve-error.rs:46:10
    |
-45 | #[derive(Dlone)]
-   |          ^^^^^
-   |
-   = help: did you mean `Clone`?
+46 | #[derive(Dlone)]
+   |          ^^^^^ help: try: `Clone`
 
 error: cannot find derive macro `Dlona` in this scope
-  --> $DIR/resolve-error.rs:48:10
-   |
-48 | #[derive(Dlona)]
-   |          ^^^^^
+  --> $DIR/resolve-error.rs:49:10
    |
-   = help: did you mean `Clona`?
+49 | #[derive(Dlona)]
+   |          ^^^^^ help: try: `Clona`
 
 error: cannot find derive macro `attr_proc_macra` in this scope
-  --> $DIR/resolve-error.rs:51:10
+  --> $DIR/resolve-error.rs:52:10
    |
-51 | #[derive(attr_proc_macra)]
+52 | #[derive(attr_proc_macra)]
    |          ^^^^^^^^^^^^^^^
 
 error: cannot find macro `FooWithLongNama!` in this scope
-  --> $DIR/resolve-error.rs:55:5
+  --> $DIR/resolve-error.rs:56:5
    |
-55 |     FooWithLongNama!();
-   |     ^^^^^^^^^^^^^^^
-   |
-   = help: did you mean `FooWithLongNam!`?
+56 |     FooWithLongNama!();
+   |     ^^^^^^^^^^^^^^^ help: you could try the macro: `FooWithLongNam!`
 
 error: cannot find macro `attr_proc_macra!` in this scope
-  --> $DIR/resolve-error.rs:57:5
-   |
-57 |     attr_proc_macra!();
-   |     ^^^^^^^^^^^^^^^
+  --> $DIR/resolve-error.rs:58:5
    |
-   = help: did you mean `attr_proc_mac!`?
+58 |     attr_proc_macra!();
+   |     ^^^^^^^^^^^^^^^ help: you could try the macro: `attr_proc_mac!`
 
 error: cannot find macro `Dlona!` in this scope
-  --> $DIR/resolve-error.rs:59:5
+  --> $DIR/resolve-error.rs:60:5
    |
-59 |     Dlona!();
+60 |     Dlona!();
    |     ^^^^^
 
 error: cannot find macro `bang_proc_macrp!` in this scope
-  --> $DIR/resolve-error.rs:61:5
-   |
-61 |     bang_proc_macrp!();
-   |     ^^^^^^^^^^^^^^^
+  --> $DIR/resolve-error.rs:62:5
    |
-   = help: did you mean `bang_proc_macro!`?
+62 |     bang_proc_macrp!();
+   |     ^^^^^^^^^^^^^^^ help: you could try the macro: `bang_proc_macro!`
 
 error: aborting due to 10 previous errors
 

src/test/ui/issue-35675.stderr

@@ -5,7 +5,7 @@ error[E0412]: cannot find type `Apple` in this scope
    |                             ^^^^^
    |                             |
    |                             not found in this scope
-   |                             help: did you mean the variant's enum `Fruit`
+   |                             help: you can try using the variant's enum: `Fruit`
 
 error[E0425]: cannot find function `Apple` in this scope
   --> $DIR/issue-35675.rs:23:5
@@ -23,7 +23,7 @@ error[E0573]: expected type, found variant `Fruit::Apple`
    |                                 ^^^^^^^^^^^^
    |                                 |
    |                                 not a type
-   |                                 help: did you mean the variant's enum `Fruit`
+   |                                 help: you can try using the variant's enum: `Fruit`
 
 error[E0425]: cannot find function `Apple` in this scope
   --> $DIR/issue-35675.rs:31:5
@@ -40,8 +40,8 @@ error[E0573]: expected type, found variant `Ok`
 36 | fn foo() -> Ok {
    |             ^^ not a type
    |
-   = help: there is an enum variant `std::prelude::v1::Ok`,did you mean to use `std::prelude::v1`?
-   = help: there is an enum variant `std::prelude::v1::Result::Ok`,did you mean to use `std::prelude::v1::Result`?
+   = help: there is an enum variant `std::prelude::v1::Ok`, try using `std::prelude::v1`?
+   = help: there is an enum variant `std::prelude::v1::Result::Ok`, try using `std::prelude::v1::Result`?
 
 error[E0412]: cannot find type `Variant3` in this scope
   --> $DIR/issue-35675.rs:44:13
@@ -50,16 +50,16 @@ error[E0412]: cannot find type `Variant3` in this scope
    |             ^^^^^^^^
    |             |
    |             not found in this scope
-   |             help: did you mean the variant's enum `x::Enum`
+   |             help: you can try using the variant's enum: `x::Enum`
 
 error[E0573]: expected type, found variant `Some`
   --> $DIR/issue-35675.rs:49:13
    |
 49 | fn qux() -> Some {
    |             ^^^^ not a type
    |
-   = help: there is an enum variant `std::option::Option::Some`,did you mean to use `std::option::Option`?
-   = help: there is an enum variant `std::prelude::v1::Some`,did you mean to use `std::prelude::v1`?
+   = help: there is an enum variant `std::option::Option::Some`, try using `std::option::Option`?
+   = help: there is an enum variant `std::prelude::v1::Some`, try using `std::prelude::v1`?
 
 error: aborting due to 7 previous errors
 

src/test/ui/issue-40402-ref-hints/issue-40402-1.stderr

@@ -4,7 +4,7 @@ error[E0507]: cannot move out of indexed content
 19 |     let e = f.v[0];
    |             ^^^^^^
    |             |
-   |             help: consider using a reference instead `&f.v[0]`
+   |             help: consider using a reference instead: `&f.v[0]`
    |             cannot move out of indexed content
 
 error: aborting due to previous error

src/test/ui/macros/macro-name-typo.stderr

@@ -2,9 +2,7 @@ error: cannot find macro `printlx!` in this scope
   --> $DIR/macro-name-typo.rs:12:5
    |
 12 |     printlx!("oh noes!");
-   |     ^^^^^^^
-   |
-   = help: did you mean `println!`?
+   |     ^^^^^^^ help: you could try the macro: `println!`
 
 error: aborting due to previous error
 

src/test/ui/macros/macro_undefined.stderr

@@ -10,9 +10,7 @@ error: cannot find macro `k!` in this scope
   --> $DIR/macro_undefined.rs:21:5
    |
 21 |     k!();
-   |     ^
-   |
-   = help: did you mean `kl!`?
+   |     ^ help: you could try the macro: `kl!`
 
 error: aborting due to 2 previous errors
 

src/test/ui/resolve/issue-14254.stderr

@@ -2,7 +2,7 @@ error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:29:9
    |
 29 |         baz();
-   |         ^^^ help: did you mean `self.baz`
+   |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:32:9
@@ -14,19 +14,19 @@ error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:40:9
    |
 40 |         baz();
-   |         ^^^ help: did you mean `self.baz`
+   |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `x` in this scope
   --> $DIR/issue-14254.rs:43:9
    |
 43 |         x;
-   |         ^ help: did you mean `self.x`
+   |         ^ help: try: `self.x`
 
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/issue-14254.rs:46:9
    |
 46 |         y;
-   |         ^ help: did you mean `self.y`
+   |         ^ help: try: `self.y`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:49:9
@@ -38,7 +38,7 @@ error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:52:9
    |
 52 |         bah;
-   |         ^^^ help: did you mean `Self::bah`
+   |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find value `b` in this scope
   --> $DIR/issue-14254.rs:55:9
@@ -50,19 +50,19 @@ error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:63:9
    |
 63 |         baz();
-   |         ^^^ help: did you mean `self.baz`
+   |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `x` in this scope
   --> $DIR/issue-14254.rs:66:9
    |
 66 |         x;
-   |         ^ help: did you mean `self.x`
+   |         ^ help: try: `self.x`
 
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/issue-14254.rs:69:9
    |
 69 |         y;
-   |         ^ help: did you mean `self.y`
+   |         ^ help: try: `self.y`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:72:9
@@ -74,7 +74,7 @@ error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:75:9
    |
 75 |         bah;
-   |         ^^^ help: did you mean `Self::bah`
+   |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find value `b` in this scope
   --> $DIR/issue-14254.rs:78:9
@@ -86,61 +86,61 @@ error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:86:9
    |
 86 |         baz();
-   |         ^^^ help: did you mean `self.baz`
+   |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:89:9
    |
 89 |         bah;
-   |         ^^^ help: did you mean `Self::bah`
+   |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:97:9
    |
 97 |         baz();
-   |         ^^^ help: did you mean `self.baz`
+   |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
    --> $DIR/issue-14254.rs:100:9
     |
 100 |         bah;
-    |         ^^^ help: did you mean `Self::bah`
+    |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
    --> $DIR/issue-14254.rs:108:9
     |
 108 |         baz();
-    |         ^^^ help: did you mean `self.baz`
+    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
    --> $DIR/issue-14254.rs:111:9
     |
 111 |         bah;
-    |         ^^^ help: did you mean `Self::bah`
+    |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
    --> $DIR/issue-14254.rs:119:9
     |
 119 |         baz();
-    |         ^^^ help: did you mean `self.baz`
+    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
    --> $DIR/issue-14254.rs:122:9
     |
 122 |         bah;
-    |         ^^^ help: did you mean `Self::bah`
+    |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
    --> $DIR/issue-14254.rs:130:9
     |
 130 |         baz();
-    |         ^^^ help: did you mean `self.baz`
+    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
    --> $DIR/issue-14254.rs:133:9
     |
 133 |         bah;
-    |         ^^^ help: did you mean `Self::bah`
+    |         ^^^ help: try: `Self::bah`
 
 error: main function not found
 

src/test/ui/resolve/issue-2356.stderr

@@ -8,28 +8,28 @@ error[E0425]: cannot find function `clone` in this scope
   --> $DIR/issue-2356.rs:35:5
    |
 35 |     clone();
-   |     ^^^^^ help: did you mean `self.clone`
+   |     ^^^^^ help: try: `self.clone`
 
 error[E0425]: cannot find function `default` in this scope
   --> $DIR/issue-2356.rs:43:5
    |
 43 |     default();
-   |     ^^^^^^^ help: did you mean `Self::default`
+   |     ^^^^^^^ help: try: `Self::default`
 
 error[E0425]: cannot find value `whiskers` in this scope
   --> $DIR/issue-2356.rs:52:5
    |
 52 |     whiskers -= other;
    |     ^^^^^^^^
    |     |
-   |     help: did you mean `self.whiskers`
+   |     help: try: `self.whiskers`
    |     `self` value is only available in methods with `self` parameter
 
 error[E0425]: cannot find function `shave` in this scope
   --> $DIR/issue-2356.rs:57:5
    |
 57 |     shave(4);
-   |     ^^^^^ help: did you mean `Self::shave`
+   |     ^^^^^ help: try: `Self::shave`
 
 error[E0425]: cannot find function `purr` in this scope
   --> $DIR/issue-2356.rs:60:5
@@ -83,15 +83,15 @@ error[E0425]: cannot find value `whiskers` in this scope
    --> $DIR/issue-2356.rs:104:5
     |
 104 |     whiskers = 0;
-    |     ^^^^^^^^ help: did you mean `self.whiskers`
+    |     ^^^^^^^^ help: try: `self.whiskers`
 
 error[E0425]: cannot find value `whiskers` in this scope
    --> $DIR/issue-2356.rs:110:5
     |
 110 |     whiskers = 4;
     |     ^^^^^^^^
     |     |
-    |     help: did you mean `self.whiskers`
+    |     help: try: `self.whiskers`
     |     `self` value is only available in methods with `self` parameter
 
 error[E0425]: cannot find function `purr_louder` in this scope