Skip to content

Commit 5986fe2

Browse files
committed
Update ui tests
1 parent 16b7f44 commit 5986fe2

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/test/ui/const-generics/fn-const-param-infer.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ error[E0308]: mismatched types
1212
LL | let _: Checked<{not_one}> = Checked::<{not_two}>;
1313
| ^^^^^^^^^^^^^^^^^^^^ expected `not_one`, found `not_two`
1414
|
15-
= note: expected type `Checked<>`
16-
found type `Checked<>`
15+
= note: expected type `Checked<not_one>`
16+
found type `Checked<not_two>`
1717

1818
error[E0308]: mismatched types
1919
--> $DIR/fn-const-param-infer.rs:20:24
@@ -36,8 +36,8 @@ error[E0308]: mismatched types
3636
LL | let _: Checked<{generic::<u32>}> = Checked::<{generic::<u16>}>;
3737
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `generic::<u32>`, found `generic::<u16>`
3838
|
39-
= note: expected type `Checked<>`
40-
found type `Checked<>`
39+
= note: expected type `Checked<generic::<u32>>`
40+
found type `Checked<generic::<u16>>`
4141

4242
error: aborting due to 4 previous errors
4343

src/test/ui/const-generics/raw-ptr-const-param.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ error[E0308]: mismatched types
1212
LL | let _: Const<{15 as *const _}> = Const::<{10 as *const _}>;
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Scalar(0x000000000000000f) : *const u32`, found `Scalar(0x000000000000000a) : *const u32`
1414
|
15-
= note: expected type `Const<>`
16-
found type `Const<>`
15+
= note: expected type `Const<Scalar(0x000000000000000f) : *const u32>`
16+
found type `Const<Scalar(0x000000000000000a) : *const u32>`
1717

1818
error: aborting due to previous error
1919

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
struct ConstFn<const F: fn()>;
22
//~^ ERROR const generics are unstable
3-
//~^^ ERROR use of function pointers as const generic arguments are unstable
3+
//~^^ ERROR using function pointers as const generic parameters is unstable
44

55
struct ConstPtr<const P: *const u32>;
66
//~^ ERROR const generics are unstable
7-
//~^^ ERROR use of raw pointers as const generic arguments are unstable
7+
//~^^ ERROR using raw pointers as const generic parameters is unstable
88

99
fn main() {}

src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LL | struct ConstPtr<const P: *const u32>;
1616
= note: for more information, see https://github.com/rust-lang/rust/issues/44580
1717
= help: add `#![feature(const_generics)]` to the crate attributes to enable
1818

19-
error[E0658]: use of function pointers as const generic arguments are unstable
19+
error[E0658]: using function pointers as const generic parameters is unstable
2020
--> $DIR/feature-gate-const_generics-ptr.rs:1:25
2121
|
2222
LL | struct ConstFn<const F: fn()>;
@@ -25,7 +25,7 @@ LL | struct ConstFn<const F: fn()>;
2525
= note: for more information, see https://github.com/rust-lang/rust/issues/53020
2626
= help: add `#![feature(const_compare_raw_pointers)]` to the crate attributes to enable
2727

28-
error[E0658]: use of raw pointers as const generic arguments are unstable
28+
error[E0658]: using raw pointers as const generic parameters is unstable
2929
--> $DIR/feature-gate-const_generics-ptr.rs:5:26
3030
|
3131
LL | struct ConstPtr<const P: *const u32>;

0 commit comments

Comments
 (0)