Auto merge of #56042 - petrochenkov:nuni, r=petrochenkov

[nightly] resolve: Implement uniform paths 2.0

Forward-port of https://github.com/rust-lang/rust/pull/55884 to nightly.

r? @ghost

4 files changed, 13 insertions, 13 deletions

diff --git a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr
index 9dd6a318e98..994c78d575e 100644
--- a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr
+++ b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr
@@ -2,7 +2,7 @@ error[E0530]: let bindings cannot shadow tuple structs
   --> $DIR/pat-shadow-in-nested-binding.rs:14:10
    |
 LL | struct foo(usize);
-   | ------------------ a tuple struct `foo` is defined here
+   | ------------------ the tuple struct `foo` is defined here
 ...
 LL |     let (foo, _) = (2, 3); //~ ERROR let bindings cannot shadow tuple structs
    |          ^^^ cannot be named the same as a tuple struct
diff --git a/src/test/ui/pattern/pattern-binding-disambiguation.stderr b/src/test/ui/pattern/pattern-binding-disambiguation.stderr
index 7acdb07e10d..5d14610b8a1 100644
--- a/src/test/ui/pattern/pattern-binding-disambiguation.stderr
+++ b/src/test/ui/pattern/pattern-binding-disambiguation.stderr
@@ -2,7 +2,7 @@ error[E0530]: match bindings cannot shadow tuple structs
   --> $DIR/pattern-binding-disambiguation.rs:34:9
    |
 LL | struct TupleStruct();
-   | --------------------- a tuple struct `TupleStruct` is defined here
+   | --------------------- the tuple struct `TupleStruct` is defined here
 ...
 LL |         TupleStruct => {} //~ ERROR match bindings cannot shadow tuple structs
    |         ^^^^^^^^^^^ cannot be named the same as a tuple struct
@@ -11,7 +11,7 @@ error[E0530]: match bindings cannot shadow tuple variants
   --> $DIR/pattern-binding-disambiguation.rs:43:9
    |
 LL | use E::*;
-   |     ---- a tuple variant `TupleVariant` is imported here
+   |     ---- the tuple variant `TupleVariant` is imported here
 ...
 LL |         TupleVariant => {} //~ ERROR match bindings cannot shadow tuple variants
    |         ^^^^^^^^^^^^ cannot be named the same as a tuple variant
@@ -20,7 +20,7 @@ error[E0530]: match bindings cannot shadow struct variants
   --> $DIR/pattern-binding-disambiguation.rs:46:9
    |
 LL | use E::*;
-   |     ---- a struct variant `BracedVariant` is imported here
+   |     ---- the struct variant `BracedVariant` is imported here
 ...
 LL |         BracedVariant => {} //~ ERROR match bindings cannot shadow struct variants
    |         ^^^^^^^^^^^^^ cannot be named the same as a struct variant
@@ -29,7 +29,7 @@ error[E0530]: match bindings cannot shadow statics
   --> $DIR/pattern-binding-disambiguation.rs:52:9
    |
 LL | static STATIC: () = ();
-   | ----------------------- a static `STATIC` is defined here
+   | ----------------------- the static `STATIC` is defined here
 ...
 LL |         STATIC => {} //~ ERROR match bindings cannot shadow statics
    |         ^^^^^^ cannot be named the same as a static
@@ -38,7 +38,7 @@ error[E0530]: let bindings cannot shadow tuple structs
   --> $DIR/pattern-binding-disambiguation.rs:59:9
    |
 LL | struct TupleStruct();
-   | --------------------- a tuple struct `TupleStruct` is defined here
+   | --------------------- the tuple struct `TupleStruct` is defined here
 ...
 LL |     let TupleStruct = doesnt_matter; //~ ERROR let bindings cannot shadow tuple structs
    |         ^^^^^^^^^^^ cannot be named the same as a tuple struct
@@ -47,7 +47,7 @@ error[E0530]: let bindings cannot shadow tuple variants
   --> $DIR/pattern-binding-disambiguation.rs:62:9
    |
 LL | use E::*;
-   |     ---- a tuple variant `TupleVariant` is imported here
+   |     ---- the tuple variant `TupleVariant` is imported here
 ...
 LL |     let TupleVariant = doesnt_matter; //~ ERROR let bindings cannot shadow tuple variants
    |         ^^^^^^^^^^^^ cannot be named the same as a tuple variant
@@ -56,7 +56,7 @@ error[E0530]: let bindings cannot shadow struct variants
   --> $DIR/pattern-binding-disambiguation.rs:63:9
    |
 LL | use E::*;
-   |     ---- a struct variant `BracedVariant` is imported here
+   |     ---- the struct variant `BracedVariant` is imported here
 ...
 LL |     let BracedVariant = doesnt_matter; //~ ERROR let bindings cannot shadow struct variants
    |         ^^^^^^^^^^^^^ cannot be named the same as a struct variant
@@ -65,7 +65,7 @@ error[E0530]: let bindings cannot shadow statics
   --> $DIR/pattern-binding-disambiguation.rs:65:9
    |
 LL | static STATIC: () = ();
-   | ----------------------- a static `STATIC` is defined here
+   | ----------------------- the static `STATIC` is defined here
 ...
 LL |     let STATIC = doesnt_matter; //~ ERROR let bindings cannot shadow statics
    |         ^^^^^^ cannot be named the same as a static
diff --git a/src/test/ui/pattern/pattern-error-continue.rs b/src/test/ui/pattern/pattern-error-continue.rs
index e63b84594aa..c544ca4e304 100644
--- a/src/test/ui/pattern/pattern-error-continue.rs
+++ b/src/test/ui/pattern/pattern-error-continue.rs
@@ -42,6 +42,6 @@ fn main() {
     //~| expected char, found bool
 
     match () {
-        E::V => {} //~ ERROR failed to resolve. Use of undeclared type or module `E`
+        E::V => {} //~ ERROR failed to resolve: use of undeclared type or module `E`
     }
 }
diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr
index b24366c48bc..f2c35ef872d 100644
--- a/src/test/ui/pattern/pattern-error-continue.stderr
+++ b/src/test/ui/pattern/pattern-error-continue.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `E`
+error[E0433]: failed to resolve: use of undeclared type or module `E`
   --> $DIR/pattern-error-continue.rs:45:9
    |
-LL |         E::V => {} //~ ERROR failed to resolve. Use of undeclared type or module `E`
-   |         ^ Use of undeclared type or module `E`
+LL |         E::V => {} //~ ERROR failed to resolve: use of undeclared type or module `E`
+   |         ^ use of undeclared type or module `E`
 
 error[E0532]: expected tuple struct/variant, found unit variant `A::D`
   --> $DIR/pattern-error-continue.rs:28:9