Skip to content

Commit 29f5e5c

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#67334 - estebank:ignore-triple, r=nikomatsakis
Teach `compiletest` to ignore platform triples The UI tests are written assuming `--remap-path-prefix` is *not used* (`remap-debuginfo` in `config.toml`). The consequence is that the error messages may include paths and snippets into the standard library. When `remap-debuginfo` is enabled, these messages change in format and structure because `rustc` will not show paths and snippets into the standard library. This normally isn't a problem for the "main" platforms (linux/macos/windows), because the CI infrastructure is set up so that the tests run without `remap-debuginfo`, but the `dist` artifacts are built separately with `remap-debuginfo` enabled. However, some of the lower-tier platforms perform both tests and distribution in a single step with `remap-debuginfo` enabled. This also affects developers and distributors who use `remap-debuginfo`. To sidestep this problem, we add a way to ignore tests in specific platform triples, and update the overly broad `ignore-x86` rule in affected tests. Address rust-lang#46948, rust-lang#54546, rust-lang#53081.
2 parents 5fd4689 + f772d87 commit 29f5e5c

File tree

89 files changed

+217
-126
lines changed

Some content is hidden

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

89 files changed

+217
-126
lines changed

‎src/etc/generate-deriving-span-tests.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
os.path.join(os.path.dirname(__file__), '../test/ui/derives/'))
1515

1616
TEMPLATE = """\
17-
// ignore-x86 FIXME: missing sysroot spans (#53081)
17+
// FIXME: missing sysroot spans (#53081)
18+
// ignore-i586-unknown-linux-gnu
19+
// ignore-i586-unknown-linux-musl
1820
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
1921
2022
{error_deriving}

‎src/test/ui/async-await/issues/issue-62009-1.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// edition:2018
2-
// ignore-x86 FIXME: missing sysroot spans (#53081)
2+
// FIXME: missing sysroot spans (#53081)
3+
// ignore-i586-unknown-linux-gnu
4+
// ignore-i586-unknown-linux-musl
35

46
async fn print_dur() {}
57

‎src/test/ui/async-await/issues/issue-62009-1.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0728]: `await` is only allowed inside `async` functions and blocks
2-
--> $DIR/issue-62009-1.rs:7:5
2+
--> $DIR/issue-62009-1.rs:9:5
33
|
44
LL | fn main() {
55
| ---- this is not `async`
66
LL | async { let (); }.await;
77
| ^^^^^^^^^^^^^^^^^^^^^^^ only allowed inside `async` functions and blocks
88

99
error[E0728]: `await` is only allowed inside `async` functions and blocks
10-
--> $DIR/issue-62009-1.rs:9:5
10+
--> $DIR/issue-62009-1.rs:11:5
1111
|
1212
LL | fn main() {
1313
| ---- this is not `async`
@@ -19,19 +19,19 @@ LL | | }.await;
1919
| |___________^ only allowed inside `async` functions and blocks
2020

2121
error[E0728]: `await` is only allowed inside `async` functions and blocks
22-
--> $DIR/issue-62009-1.rs:13:5
22+
--> $DIR/issue-62009-1.rs:15:5
2323
|
2424
LL | fn main() {
2525
| ---- this is not `async`
2626
...
2727
LL | (|_| 2333).await;
2828
| ^^^^^^^^^^^^^^^^ only allowed inside `async` functions and blocks
2929

30-
error[E0277]: the trait bound `[closure@$DIR/issue-62009-1.rs:13:5: 13:15]: std::future::Future` is not satisfied
31-
--> $DIR/issue-62009-1.rs:13:5
30+
error[E0277]: the trait bound `[closure@$DIR/issue-62009-1.rs:15:5: 15:15]: std::future::Future` is not satisfied
31+
--> $DIR/issue-62009-1.rs:15:5
3232
|
3333
LL | (|_| 2333).await;
34-
| ^^^^^^^^^^^^^^^^ the trait `std::future::Future` is not implemented for `[closure@$DIR/issue-62009-1.rs:13:5: 13:15]`
34+
| ^^^^^^^^^^^^^^^^ the trait `std::future::Future` is not implemented for `[closure@$DIR/issue-62009-1.rs:15:5: 15:15]`
3535
|
3636
::: $SRC_DIR/libstd/future.rs:LL:COL
3737
|

‎src/test/ui/closures/closure-move-sync.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
use std::thread;
35
use std::sync::mpsc::channel;
46

‎src/test/ui/closures/closure-move-sync.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely
2-
--> $DIR/closure-move-sync.rs:7:13
2+
--> $DIR/closure-move-sync.rs:9:13
33
|
44
LL | let t = thread::spawn(|| {
55
| ^^^^^^^^^^^^^ `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely
@@ -11,10 +11,10 @@ LL | F: FnOnce() -> T, F: Send + 'static, T: Send + 'static
1111
|
1212
= help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Receiver<()>`
1313
= note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Receiver<()>`
14-
= note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:7:27: 10:6 recv:&std::sync::mpsc::Receiver<()>]`
14+
= note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:9:27: 12:6 recv:&std::sync::mpsc::Receiver<()>]`
1515

1616
error[E0277]: `std::sync::mpsc::Sender<()>` cannot be shared between threads safely
17-
--> $DIR/closure-move-sync.rs:19:5
17+
--> $DIR/closure-move-sync.rs:21:5
1818
|
1919
LL | thread::spawn(|| tx.send(()).unwrap());
2020
| ^^^^^^^^^^^^^ `std::sync::mpsc::Sender<()>` cannot be shared between threads safely
@@ -26,7 +26,7 @@ LL | F: FnOnce() -> T, F: Send + 'static, T: Send + 'static
2626
|
2727
= help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Sender<()>`
2828
= note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Sender<()>`
29-
= note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:19:19: 19:42 tx:&std::sync::mpsc::Sender<()>]`
29+
= note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:21:19: 21:42 tx:&std::sync::mpsc::Sender<()>]`
3030

3131
error: aborting due to 2 previous errors
3232

‎src/test/ui/consts/const-size_of-cycle.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// error-pattern: cycle detected
35

46
struct Foo {

‎src/test/ui/consts/const-size_of-cycle.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0391]: cycle detected when const-evaluating + checking `Foo::bytes::{{constant}}#0`
2-
--> $DIR/const-size_of-cycle.rs:5:17
2+
--> $DIR/const-size_of-cycle.rs:7:17
33
|
44
LL | bytes: [u8; std::mem::size_of::<Foo>()]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}#0`...
8-
--> $DIR/const-size_of-cycle.rs:5:17
8+
--> $DIR/const-size_of-cycle.rs:7:17
99
|
1010
LL | bytes: [u8; std::mem::size_of::<Foo>()]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
note: ...which requires const-evaluating `Foo::bytes::{{constant}}#0`...
13-
--> $DIR/const-size_of-cycle.rs:5:17
13+
--> $DIR/const-size_of-cycle.rs:7:17
1414
|
1515
LL | bytes: [u8; std::mem::size_of::<Foo>()]
1616
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -28,7 +28,7 @@ LL | pub fn size_of<T>() -> usize;
2828
= note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`...
2929
= note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle
3030
note: cycle used when processing `Foo`
31-
--> $DIR/const-size_of-cycle.rs:4:1
31+
--> $DIR/const-size_of-cycle.rs:6:1
3232
|
3333
LL | struct Foo {
3434
| ^^^^^^^^^^

‎src/test/ui/consts/offset_from_ub.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24

35
#![feature(const_raw_ptr_deref)]
46
#![feature(const_ptr_offset_from)]

‎src/test/ui/consts/offset_from_ub.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ LL | intrinsics::ptr_offset_from(self, origin)
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
| |
77
| ptr_offset_from cannot compute offset of pointers into different allocations.
8-
| inside call to `std::ptr::<impl *const Struct>::offset_from` at $DIR/offset_from_ub.rs:19:27
8+
| inside call to `std::ptr::<impl *const Struct>::offset_from` at $DIR/offset_from_ub.rs:21:27
99
|
10-
::: $DIR/offset_from_ub.rs:13:1
10+
::: $DIR/offset_from_ub.rs:15:1
1111
|
1212
LL | / pub const DIFFERENT_ALLOC: usize = {
1313
LL | |
@@ -27,9 +27,9 @@ LL | intrinsics::ptr_offset_from(self, origin)
2727
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2828
| |
2929
| a memory access tried to interpret some bytes as a pointer
30-
| inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:25:14
30+
| inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:27:14
3131
|
32-
::: $DIR/offset_from_ub.rs:23:1
32+
::: $DIR/offset_from_ub.rs:25:1
3333
|
3434
LL | / pub const NOT_PTR: usize = {
3535
LL | |
@@ -44,9 +44,9 @@ LL | intrinsics::ptr_offset_from(self, origin)
4444
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4545
| |
4646
| exact_div: 1 cannot be divided by 2 without remainder
47-
| inside call to `std::ptr::<impl *const u16>::offset_from` at $DIR/offset_from_ub.rs:33:14
47+
| inside call to `std::ptr::<impl *const u16>::offset_from` at $DIR/offset_from_ub.rs:35:14
4848
|
49-
::: $DIR/offset_from_ub.rs:28:1
49+
::: $DIR/offset_from_ub.rs:30:1
5050
|
5151
LL | / pub const NOT_MULTIPLE_OF_SIZE: isize = {
5252
LL | |
@@ -64,9 +64,9 @@ LL | intrinsics::ptr_offset_from(self, origin)
6464
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6565
| |
6666
| invalid use of NULL pointer
67-
| inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:39:14
67+
| inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:41:14
6868
|
69-
::: $DIR/offset_from_ub.rs:36:1
69+
::: $DIR/offset_from_ub.rs:38:1
7070
|
7171
LL | / pub const OFFSET_FROM_NULL: isize = {
7272
LL | |
@@ -82,9 +82,9 @@ LL | intrinsics::ptr_offset_from(self, origin)
8282
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8383
| |
8484
| a memory access tried to interpret some bytes as a pointer
85-
| inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:46:14
85+
| inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:48:14
8686
|
87-
::: $DIR/offset_from_ub.rs:42:1
87+
::: $DIR/offset_from_ub.rs:44:1
8888
|
8989
LL | / pub const DIFFERENT_INT: isize = { // offset_from with two different integers: like DIFFERENT_ALLOC
9090
LL | |

‎src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::clone::Clone` is not satisfied
2-
--> $DIR/derives-span-Clone-enum-struct-variant.rs:10:6
2+
--> $DIR/derives-span-Clone-enum-struct-variant.rs:12:6
33
|
44
LL | x: Error
55
| ^^^^^^^^ the trait `std::clone::Clone` is not implemented for `Error`

‎src/test/ui/derives/derives-span-Clone-enum.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Clone-enum.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::clone::Clone` is not satisfied
2-
--> $DIR/derives-span-Clone-enum.rs:10:6
2+
--> $DIR/derives-span-Clone-enum.rs:12:6
33
|
44
LL | Error
55
| ^^^^^ the trait `std::clone::Clone` is not implemented for `Error`

‎src/test/ui/derives/derives-span-Clone-struct.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Clone-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::clone::Clone` is not satisfied
2-
--> $DIR/derives-span-Clone-struct.rs:9:5
2+
--> $DIR/derives-span-Clone-struct.rs:11:5
33
|
44
LL | x: Error
55
| ^^^^^^^^ the trait `std::clone::Clone` is not implemented for `Error`

‎src/test/ui/derives/derives-span-Clone-tuple-struct.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Clone-tuple-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::clone::Clone` is not satisfied
2-
--> $DIR/derives-span-Clone-tuple-struct.rs:9:5
2+
--> $DIR/derives-span-Clone-tuple-struct.rs:11:5
33
|
44
LL | Error
55
| ^^^^^ the trait `std::clone::Clone` is not implemented for `Error`

‎src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `Error` doesn't implement `std::fmt::Debug`
2-
--> $DIR/derives-span-Debug-enum-struct-variant.rs:10:6
2+
--> $DIR/derives-span-Debug-enum-struct-variant.rs:12:6
33
|
44
LL | x: Error
55
| ^^^^^^^^ `Error` cannot be formatted using `{:?}`

‎src/test/ui/derives/derives-span-Debug-enum.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Debug-enum.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `Error` doesn't implement `std::fmt::Debug`
2-
--> $DIR/derives-span-Debug-enum.rs:10:6
2+
--> $DIR/derives-span-Debug-enum.rs:12:6
33
|
44
LL | Error
55
| ^^^^^ `Error` cannot be formatted using `{:?}`

‎src/test/ui/derives/derives-span-Debug-struct.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Debug-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `Error` doesn't implement `std::fmt::Debug`
2-
--> $DIR/derives-span-Debug-struct.rs:9:5
2+
--> $DIR/derives-span-Debug-struct.rs:11:5
33
|
44
LL | x: Error
55
| ^^^^^^^^ `Error` cannot be formatted using `{:?}`

‎src/test/ui/derives/derives-span-Debug-tuple-struct.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Debug-tuple-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `Error` doesn't implement `std::fmt::Debug`
2-
--> $DIR/derives-span-Debug-tuple-struct.rs:9:5
2+
--> $DIR/derives-span-Debug-tuple-struct.rs:11:5
33
|
44
LL | Error
55
| ^^^^^ `Error` cannot be formatted using `{:?}`

‎src/test/ui/derives/derives-span-Default-struct.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Default-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::default::Default` is not satisfied
2-
--> $DIR/derives-span-Default-struct.rs:9:5
2+
--> $DIR/derives-span-Default-struct.rs:11:5
33
|
44
LL | x: Error
55
| ^^^^^^^^ the trait `std::default::Default` is not implemented for `Error`

‎src/test/ui/derives/derives-span-Default-tuple-struct.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46

‎src/test/ui/derives/derives-span-Default-tuple-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::default::Default` is not satisfied
2-
--> $DIR/derives-span-Default-tuple-struct.rs:9:5
2+
--> $DIR/derives-span-Default-tuple-struct.rs:11:5
33
|
44
LL | Error
55
| ^^^^^ the trait `std::default::Default` is not implemented for `Error`

‎src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46
#[derive(PartialEq)]

‎src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::cmp::Eq` is not satisfied
2-
--> $DIR/derives-span-Eq-enum-struct-variant.rs:10:6
2+
--> $DIR/derives-span-Eq-enum-struct-variant.rs:12:6
33
|
44
LL | x: Error
55
| ^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Error`

‎src/test/ui/derives/derives-span-Eq-enum.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46
#[derive(PartialEq)]

‎src/test/ui/derives/derives-span-Eq-enum.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::cmp::Eq` is not satisfied
2-
--> $DIR/derives-span-Eq-enum.rs:10:6
2+
--> $DIR/derives-span-Eq-enum.rs:12:6
33
|
44
LL | Error
55
| ^^^^^ the trait `std::cmp::Eq` is not implemented for `Error`

‎src/test/ui/derives/derives-span-Eq-struct.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ignore-x86 FIXME: missing sysroot spans (#53081)
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
24
// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
35

46
#[derive(PartialEq)]

‎src/test/ui/derives/derives-span-Eq-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `Error: std::cmp::Eq` is not satisfied
2-
--> $DIR/derives-span-Eq-struct.rs:9:5
2+
--> $DIR/derives-span-Eq-struct.rs:11:5
33
|
44
LL | x: Error
55
| ^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Error`

0 commit comments

Comments
 (0)