Merge branch 'master' into hooks

[rust.git] / src / test / ui / qualified / qualified-path-params.rs

diff --git a/src/test/ui/qualified/qualified-path-params.rs b/src/test/ui/qualified/qualified-path-params.rs
index 65549d909d0470325eae3b48bcd1e6a16d0b320b..e8a95a46010af7c17fc66a92ea6e6b3f23fc4dba 100644 (file)
--- a/src/test/ui/qualified/qualified-path-params.rs
+++ b/src/test/ui/qualified/qualified-path-params.rs
@@ -18,7 +18,8 @@ fn f<T>() {}
 fn main() {
     match 10 {
         <S as Tr>::A::f::<u8> => {}
-    //~^ ERROR expected unit struct, unit variant or constant, found associated function
-        0 ..= <S as Tr>::A::f::<u8> => {} //~ ERROR only char and numeric types are allowed in range
+        //~^ ERROR expected unit struct, unit variant or constant, found associated function
+        0 ..= <S as Tr>::A::f::<u8> => {}
+        //~^ ERROR only `char` and numeric types are allowed in range
     }
 }