Update ui tests

rust-lang · bors · Oct 12, 2019 · Sep 10, 2019 · Oct 3, 2019 · Oct 7, 2019
commit 5986fe24bd40162f11aca0327d2ecd62973c354d
diff --git a/src/test/ui/const-generics/fn-const-param-infer.stderr b/src/test/ui/const-generics/fn-const-param-infer.stderr
@@ -12,8 +12,8 @@ error[E0308]: mismatched types
 LL |     let _: Checked<{not_one}> = Checked::<{not_two}>;
    |                                 ^^^^^^^^^^^^^^^^^^^^ expected `not_one`, found `not_two`
    |
-   = note: expected type `Checked<>`
-              found type `Checked<>`
+   = note: expected type `Checked<not_one>`
+              found type `Checked<not_two>`
 
 error[E0308]: mismatched types
   --> $DIR/fn-const-param-infer.rs:20:24
@@ -36,8 +36,8 @@ error[E0308]: mismatched types
 LL |     let _: Checked<{generic::<u32>}> = Checked::<{generic::<u16>}>;
    |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `generic::<u32>`, found `generic::<u16>`
    |
-   = note: expected type `Checked<>`
-              found type `Checked<>`
+   = note: expected type `Checked<generic::<u32>>`
+              found type `Checked<generic::<u16>>`
 
 error: aborting due to 4 previous errors
 

diff --git a/src/test/ui/const-generics/raw-ptr-const-param.stderr b/src/test/ui/const-generics/raw-ptr-const-param.stderr
@@ -12,8 +12,8 @@ error[E0308]: mismatched types
 LL |     let _: Const<{15 as *const _}> = Const::<{10 as *const _}>;
    |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Scalar(0x000000000000000f) : *const u32`, found `Scalar(0x000000000000000a) : *const u32`
    |
-   = note: expected type `Const<>`
-              found type `Const<>`
+   = note: expected type `Const<Scalar(0x000000000000000f) : *const u32>`
+              found type `Const<Scalar(0x000000000000000a) : *const u32>`
 
 error: aborting due to previous error
 

diff --git a/src/test/ui/feature-gates/feature-gate-const_generics-ptr.rs b/src/test/ui/feature-gates/feature-gate-const_generics-ptr.rs
@@ -1,9 +1,9 @@
 struct ConstFn<const F: fn()>;
 //~^ ERROR const generics are unstable
-//~^^ ERROR use of function pointers as const generic arguments are unstable
+//~^^ ERROR using function pointers as const generic parameters is unstable
 
 struct ConstPtr<const P: *const u32>;
 //~^ ERROR const generics are unstable
-//~^^ ERROR use of raw pointers as const generic arguments are unstable
+//~^^ ERROR using raw pointers as const generic parameters is unstable
 
 fn main() {}
diff --git a/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr b/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr
@@ -16,7 +16,7 @@ LL | struct ConstPtr<const P: *const u32>;
    = note: for more information, see https://github.com/rust-lang/rust/issues/44580
    = help: add `#![feature(const_generics)]` to the crate attributes to enable
 
-error[E0658]: use of function pointers as const generic arguments are unstable
+error[E0658]: using function pointers as const generic parameters is unstable
   --> $DIR/feature-gate-const_generics-ptr.rs:1:25
    |
 LL | struct ConstFn<const F: fn()>;
@@ -25,7 +25,7 @@ LL | struct ConstFn<const F: fn()>;
    = note: for more information, see https://github.com/rust-lang/rust/issues/53020
    = help: add `#![feature(const_compare_raw_pointers)]` to the crate attributes to enable
 
-error[E0658]: use of raw pointers as const generic arguments are unstable
+error[E0658]: using raw pointers as const generic parameters is unstable
   --> $DIR/feature-gate-const_generics-ptr.rs:5:26
    |
 LL | struct ConstPtr<const P: *const u32>;