Skip to content

Commit 25fbf98

Browse files
steffahnsteffahn
committed
Bless changes in UI test output
1 parent b423eb9 commit 25fbf98

File tree

72 files changed

+273
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+273
-273
lines changed

‎src/test/ui/asm/x86_64/type-check-2.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ LL | asm!("{}", in(reg) [1, 2, 3]);
6363
|
6464
= note: only integers, floats, SIMD vectors, pointers and function pointers can be used as arguments for inline assembly
6565

66-
error: cannot use value of type `fn() {main}` for inline assembly
66+
error: cannot use value of type `[fn item {main}: fn()]` for inline assembly
6767
--> $DIR/type-check-2.rs:66:31
6868
|
6969
LL | asm!("{}", inout(reg) f);

‎src/test/ui/associated-types/substs-ppaux.normal.stderr‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ error[E0308]: mismatched types
22
--> $DIR/substs-ppaux.rs:16:17
33
|
44
LL | fn bar<'a, T>() where T: 'a {}
5-
| --------------------------- fn() {<i8 as Foo<'static, 'static, u8>>::bar::<'static, char>} defined here
5+
| --------------------------- [fn item {<i8 as Foo<'static, 'static, u8>>::bar::<'static, char>}: fn()] defined here
66
...
77
LL | let x: () = <i8 as Foo<'static, 'static, u8>>::bar::<'static, char>;
88
| -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
99
| |
1010
| expected due to this
1111
|
1212
= note: expected unit type `()`
13-
found fn item `fn() {<i8 as Foo<'static, 'static, u8>>::bar::<'static, char>}`
13+
found fn item `[fn item {<i8 as Foo<'static, 'static, u8>>::bar::<'static, char>}: fn()]`
1414
help: use parentheses to call this function
1515
|
1616
LL | let x: () = <i8 as Foo<'static, 'static, u8>>::bar::<'static, char>();
@@ -20,15 +20,15 @@ error[E0308]: mismatched types
2020
--> $DIR/substs-ppaux.rs:25:17
2121
|
2222
LL | fn bar<'a, T>() where T: 'a {}
23-
| --------------------------- fn() {<i8 as Foo<'static, 'static>>::bar::<'static, char>} defined here
23+
| --------------------------- [fn item {<i8 as Foo<'static, 'static>>::bar::<'static, char>}: fn()] defined here
2424
...
2525
LL | let x: () = <i8 as Foo<'static, 'static, u32>>::bar::<'static, char>;
2626
| -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
2727
| |
2828
| expected due to this
2929
|
3030
= note: expected unit type `()`
31-
found fn item `fn() {<i8 as Foo<'static, 'static>>::bar::<'static, char>}`
31+
found fn item `[fn item {<i8 as Foo<'static, 'static>>::bar::<'static, char>}: fn()]`
3232
help: use parentheses to call this function
3333
|
3434
LL | let x: () = <i8 as Foo<'static, 'static, u32>>::bar::<'static, char>();
@@ -38,15 +38,15 @@ error[E0308]: mismatched types
3838
--> $DIR/substs-ppaux.rs:33:17
3939
|
4040
LL | fn baz() {}
41-
| -------- fn() {<i8 as Foo<'static, 'static, u8>>::baz} defined here
41+
| -------- [fn item {<i8 as Foo<'static, 'static, u8>>::baz}: fn()] defined here
4242
...
4343
LL | let x: () = <i8 as Foo<'static, 'static, u8>>::baz;
4444
| -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
4545
| |
4646
| expected due to this
4747
|
4848
= note: expected unit type `()`
49-
found fn item `fn() {<i8 as Foo<'static, 'static, u8>>::baz}`
49+
found fn item `[fn item {<i8 as Foo<'static, 'static, u8>>::baz}: fn()]`
5050
help: use parentheses to call this function
5151
|
5252
LL | let x: () = <i8 as Foo<'static, 'static, u8>>::baz();
@@ -56,15 +56,15 @@ error[E0308]: mismatched types
5656
--> $DIR/substs-ppaux.rs:41:17
5757
|
5858
LL | fn foo<'z>() where &'z (): Sized {
59-
| -------------------------------- fn() {foo::<'static>} defined here
59+
| -------------------------------- [fn item {foo::<'static>}: fn()] defined here
6060
...
6161
LL | let x: () = foo::<'static>;
6262
| -- ^^^^^^^^^^^^^^ expected `()`, found fn item
6363
| |
6464
| expected due to this
6565
|
6666
= note: expected unit type `()`
67-
found fn item `fn() {foo::<'static>}`
67+
found fn item `[fn item {foo::<'static>}: fn()]`
6868
help: use parentheses to call this function
6969
|
7070
LL | let x: () = foo::<'static>();

‎src/test/ui/associated-types/substs-ppaux.verbose.stderr‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ error[E0308]: mismatched types
22
--> $DIR/substs-ppaux.rs:16:17
33
|
44
LL | fn bar<'a, T>() where T: 'a {}
5-
| --------------------------- fn() {<i8 as Foo<ReStatic, ReStatic, u8>>::bar::<ReStatic, char>} defined here
5+
| --------------------------- [fn item {<i8 as Foo<ReStatic, ReStatic, u8>>::bar::<ReStatic, char>}: fn()] defined here
66
...
77
LL | let x: () = <i8 as Foo<'static, 'static, u8>>::bar::<'static, char>;
88
| -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
99
| |
1010
| expected due to this
1111
|
1212
= note: expected unit type `()`
13-
found fn item `fn() {<i8 as Foo<ReStatic, ReStatic, u8>>::bar::<ReStatic, char>}`
13+
found fn item `[fn item {<i8 as Foo<ReStatic, ReStatic, u8>>::bar::<ReStatic, char>}: fn()]`
1414
help: use parentheses to call this function
1515
|
1616
LL | let x: () = <i8 as Foo<'static, 'static, u8>>::bar::<'static, char>();
@@ -20,15 +20,15 @@ error[E0308]: mismatched types
2020
--> $DIR/substs-ppaux.rs:25:17
2121
|
2222
LL | fn bar<'a, T>() where T: 'a {}
23-
| --------------------------- fn() {<i8 as Foo<ReStatic, ReStatic>>::bar::<ReStatic, char>} defined here
23+
| --------------------------- [fn item {<i8 as Foo<ReStatic, ReStatic>>::bar::<ReStatic, char>}: fn()] defined here
2424
...
2525
LL | let x: () = <i8 as Foo<'static, 'static, u32>>::bar::<'static, char>;
2626
| -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
2727
| |
2828
| expected due to this
2929
|
3030
= note: expected unit type `()`
31-
found fn item `fn() {<i8 as Foo<ReStatic, ReStatic>>::bar::<ReStatic, char>}`
31+
found fn item `[fn item {<i8 as Foo<ReStatic, ReStatic>>::bar::<ReStatic, char>}: fn()]`
3232
help: use parentheses to call this function
3333
|
3434
LL | let x: () = <i8 as Foo<'static, 'static, u32>>::bar::<'static, char>();
@@ -38,15 +38,15 @@ error[E0308]: mismatched types
3838
--> $DIR/substs-ppaux.rs:33:17
3939
|
4040
LL | fn baz() {}
41-
| -------- fn() {<i8 as Foo<ReStatic, ReStatic, u8>>::baz} defined here
41+
| -------- [fn item {<i8 as Foo<ReStatic, ReStatic, u8>>::baz}: fn()] defined here
4242
...
4343
LL | let x: () = <i8 as Foo<'static, 'static, u8>>::baz;
4444
| -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found fn item
4545
| |
4646
| expected due to this
4747
|
4848
= note: expected unit type `()`
49-
found fn item `fn() {<i8 as Foo<ReStatic, ReStatic, u8>>::baz}`
49+
found fn item `[fn item {<i8 as Foo<ReStatic, ReStatic, u8>>::baz}: fn()]`
5050
help: use parentheses to call this function
5151
|
5252
LL | let x: () = <i8 as Foo<'static, 'static, u8>>::baz();
@@ -56,15 +56,15 @@ error[E0308]: mismatched types
5656
--> $DIR/substs-ppaux.rs:41:17
5757
|
5858
LL | fn foo<'z>() where &'z (): Sized {
59-
| -------------------------------- fn() {foo::<ReStatic>} defined here
59+
| -------------------------------- [fn item {foo::<ReStatic>}: fn()] defined here
6060
...
6161
LL | let x: () = foo::<'static>;
6262
| -- ^^^^^^^^^^^^^^ expected `()`, found fn item
6363
| |
6464
| expected due to this
6565
|
6666
= note: expected unit type `()`
67-
found fn item `fn() {foo::<ReStatic>}`
67+
found fn item `[fn item {foo::<ReStatic>}: fn()]`
6868
help: use parentheses to call this function
6969
|
7070
LL | let x: () = foo::<'static>();

‎src/test/ui/binop/issue-77910-1.stderr‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
error[E0369]: binary operation `==` cannot be applied to type `for<'r> fn(&'r i32) -> &'r i32 {foo}`
1+
error[E0369]: binary operation `==` cannot be applied to type `[fn item {foo}: for<'r> fn(&'r i32) -> &'r i32]`
22
--> $DIR/issue-77910-1.rs:8:5
33
|
44
LL | assert_eq!(foo, y);
55
| ^^^^^^^^^^^^^^^^^^
66
| |
7-
| for<'r> fn(&'r i32) -> &'r i32 {foo}
7+
| [fn item {foo}: for<'r> fn(&'r i32) -> &'r i32]
88
| _
99
|
1010
= note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
1111

12-
error[E0277]: `for<'r> fn(&'r i32) -> &'r i32 {foo}` doesn't implement `Debug`
12+
error[E0277]: `[fn item {foo}: for<'r> fn(&'r i32) -> &'r i32]` doesn't implement `Debug`
1313
--> $DIR/issue-77910-1.rs:8:5
1414
|
1515
LL | fn foo(s: &i32) -> &i32 {
1616
| --- consider calling this function
1717
...
1818
LL | assert_eq!(foo, y);
19-
| ^^^^^^^^^^^^^^^^^^ `for<'r> fn(&'r i32) -> &'r i32 {foo}` cannot be formatted using `{:?}` because it doesn't implement `Debug`
19+
| ^^^^^^^^^^^^^^^^^^ `[fn item {foo}: for<'r> fn(&'r i32) -> &'r i32]` cannot be formatted using `{:?}` because it doesn't implement `Debug`
2020
|
21-
= help: the trait `Debug` is not implemented for `for<'r> fn(&'r i32) -> &'r i32 {foo}`
21+
= help: the trait `Debug` is not implemented for `[fn item {foo}: for<'r> fn(&'r i32) -> &'r i32]`
2222
= help: use parentheses to call the function: `foo(s)`
2323
= note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
2424

‎src/test/ui/binop/issue-77910-2.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error[E0369]: binary operation `==` cannot be applied to type `for<'r> fn(&'r i32) -> &'r i32 {foo}`
1+
error[E0369]: binary operation `==` cannot be applied to type `[fn item {foo}: for<'r> fn(&'r i32) -> &'r i32]`
22
--> $DIR/issue-77910-2.rs:7:12
33
|
44
LL | if foo == y {}
55
| --- ^^ - _
66
| |
7-
| for<'r> fn(&'r i32) -> &'r i32 {foo}
7+
| [fn item {foo}: for<'r> fn(&'r i32) -> &'r i32]
88

99
error: aborting due to previous error
1010

‎src/test/ui/c-variadic/issue-32201.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0617]: can't pass `fn(*const u8) {bar}` to variadic function
1+
error[E0617]: can't pass `[fn item {bar}: fn(*const u8)]` to variadic function
22
--> $DIR/issue-32201.rs:9:16
33
|
44
LL | foo(0, bar);

‎src/test/ui/c-variadic/variadic-ffi-1.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ LL | let x: unsafe extern "C" fn(f: isize, x: u8) = foo;
4545
| expected due to this
4646
|
4747
= note: expected fn pointer `unsafe extern "C" fn(_, _)`
48-
found fn item `unsafe extern "C" fn(_, _, ...) {foo}`
48+
found fn item `[fn item {foo}: unsafe extern "C" fn(_, _, ...)]`
4949

5050
error[E0308]: mismatched types
5151
--> $DIR/variadic-ffi-1.rs:24:54
@@ -56,7 +56,7 @@ LL | let y: extern "C" fn(f: isize, x: u8, ...) = bar;
5656
| expected due to this
5757
|
5858
= note: expected fn pointer `extern "C" fn(_, _, ...)`
59-
found fn item `extern "C" fn(_, _) {bar}`
59+
found fn item `[fn item {bar}: extern "C" fn(_, _)]`
6060

6161
error[E0617]: can't pass `f32` to variadic function
6262
--> $DIR/variadic-ffi-1.rs:26:19

‎src/test/ui/cast/cast-to-bare-fn.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0605]: non-primitive cast: `fn(isize) {foo}` as `extern "C" fn() -> isize`
1+
error[E0605]: non-primitive cast: `[fn item {foo}: fn(isize)]` as `extern "C" fn() -> isize`
22
--> $DIR/cast-to-bare-fn.rs:5:13
33
|
44
LL | let x = foo as extern "C" fn() -> isize;

‎src/test/ui/closures/closure_cap_coerce_many_fail.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ error[E0308]: `match` arms have incompatible types
44
LL | let _ = match "+" {
55
| _____________-
66
LL | | "+" => add,
7-
| | --- this is found to be of type `fn(i32, i32) -> i32 {add}`
7+
| | --- this is found to be of type `[fn item {add}: fn(i32, i32) -> i32]`
88
LL | | "-" => |a, b| (a - b + cap) as i32,
99
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn item, found closure
1010
LL | | _ => unimplemented!(),
1111
LL | | };
1212
| |_____- `match` arms have incompatible types
1313
|
14-
= note: expected fn item `fn(i32, i32) -> i32 {add}`
14+
= note: expected fn item `[fn item {add}: fn(i32, i32) -> i32]`
1515
found closure `[closure@$DIR/closure_cap_coerce_many_fail.rs:9:16: 9:22]`
1616

1717
error[E0308]: `match` arms have incompatible types

‎src/test/ui/closures/coerce-unsafe-to-closure.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
error[E0277]: expected a `FnOnce<(&str,)>` closure, found `unsafe extern "rust-intrinsic" fn(_) -> _ {transmute::<_, _>}`
1+
error[E0277]: expected a `FnOnce<(&str,)>` closure, found `[fn item {transmute::<_, _>}: unsafe extern "rust-intrinsic" fn(_) -> _]`
22
--> $DIR/coerce-unsafe-to-closure.rs:2:44
33
|
44
LL | let x: Option<&[u8]> = Some("foo").map(std::mem::transmute);
55
| --- ^^^^^^^^^^^^^^^^^^^ call the function in a closure: `|| unsafe { /* code */ }`
66
| |
77
| required by a bound introduced by this call
88
|
9-
= help: the trait `FnOnce<(&str,)>` is not implemented for `unsafe extern "rust-intrinsic" fn(_) -> _ {transmute::<_, _>}`
9+
= help: the trait `FnOnce<(&str,)>` is not implemented for `[fn item {transmute::<_, _>}: unsafe extern "rust-intrinsic" fn(_) -> _]`
1010
= note: unsafe function cannot be called generically without an unsafe block
1111
note: required by a bound in `Option::<T>::map`
1212
--> $SRC_DIR/core/src/option.rs:LL:COL

0 commit comments

Comments
 (0)