rustc: desugar UFCS as much as possible during HIR lowering.

5 files changed, 10 insertions, 8 deletions

diff --git a/src/test/compile-fail/issue-28992-empty.rs b/src/test/compile-fail/issue-28992-empty.rs
index d47fdda0203..48aabce708e 100644
--- a/src/test/compile-fail/issue-28992-empty.rs
+++ b/src/test/compile-fail/issue-28992-empty.rs
@@ -23,5 +23,5 @@ impl S {
 fn main() {
     if let C1(..) = 0 {} //~ ERROR expected tuple struct/variant, found constant `C1`
     if let S::C2(..) = 0 {}
-    //~^ ERROR expected tuple struct/variant, found associated constant `S::C2`
+    //~^ ERROR expected tuple struct/variant, found associated constant `<S>::C2`
 }
diff --git a/src/test/compile-fail/method-path-in-pattern.rs b/src/test/compile-fail/method-path-in-pattern.rs
index aaa89b22829..671a518073c 100644
--- a/src/test/compile-fail/method-path-in-pattern.rs
+++ b/src/test/compile-fail/method-path-in-pattern.rs
@@ -22,13 +22,15 @@ impl MyTrait for Foo {}
 
 fn main() {
     match 0u32 {
-        Foo::bar => {} //~ ERROR expected unit struct/variant or constant, found method `Foo::bar`
+        Foo::bar => {}
+        //~^ ERROR expected unit struct/variant or constant, found method `<Foo>::bar`
     }
     match 0u32 {
-        <Foo>::bar => {} //~ ERROR expected unit struct/variant or constant, found method `bar`
+        <Foo>::bar => {}
+        //~^ ERROR expected unit struct/variant or constant, found method `<Foo>::bar`
     }
     match 0u32 {
         <Foo>::trait_bar => {}
-        //~^ ERROR expected unit struct/variant or constant, found method `trait_bar`
+        //~^ ERROR expected unit struct/variant or constant, found method `<Foo>::trait_bar`
     }
 }
diff --git a/src/test/compile-fail/qualified-path-params.rs b/src/test/compile-fail/qualified-path-params.rs
index 82b0536a64a..a7bc27e1749 100644
--- a/src/test/compile-fail/qualified-path-params.rs
+++ b/src/test/compile-fail/qualified-path-params.rs
@@ -28,7 +28,7 @@ impl S {
 fn main() {
     match 10 {
         <S as Tr>::A::f::<u8> => {}
-        //~^ ERROR expected unit struct/variant or constant, found method `Tr::A::f<u8>`
+        //~^ ERROR expected unit struct/variant or constant, found method `<<S as Tr>::A>::f<u8>`
         0 ... <S as Tr>::A::f::<u8> => {} //~ ERROR only char and numeric types are allowed in range
     }
 }
diff --git a/src/test/compile-fail/unspecified-self-in-trait-ref.rs b/src/test/compile-fail/unspecified-self-in-trait-ref.rs
index 2c2f113a779..84bcca3fc7b 100644
--- a/src/test/compile-fail/unspecified-self-in-trait-ref.rs
+++ b/src/test/compile-fail/unspecified-self-in-trait-ref.rs
@@ -9,11 +9,11 @@
 // except according to those terms.
 
 pub trait Foo<A=Self> {
-    fn foo();
+    fn foo(&self);
 }
 
 pub trait Bar<X=usize, A=Self> {
-    fn foo();
+    fn foo(&self);
 }
 
 fn main() {
diff --git a/src/test/pretty/issue-4264.pp b/src/test/pretty/issue-4264.pp
index 24b0f90d08e..fdb7f9c68b9 100644
--- a/src/test/pretty/issue-4264.pp
+++ b/src/test/pretty/issue-4264.pp
@@ -40,7 +40,7 @@ pub fn bar() ({
 
 
                   (($crate::fmt::format as
-                       fn(std::fmt::Arguments<'_>) -> std::string::String {std::fmt::format})(((::std::fmt::Arguments::new_v1
+                       fn(std::fmt::Arguments<'_>) -> std::string::String {std::fmt::format})(((<::std::fmt::Arguments>::new_v1
                                                                                                    as
                                                                                                    fn(&[&str], &[std::fmt::ArgumentV1<'_>]) -> std::fmt::Arguments<'_> {std::fmt::Arguments<'_>::new_v1})(({
                                                                                                                                                                                                                static __STATIC_FMTSTR: