Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 62366ee

Browse files
tmiaskotmiasko
committedFeb 9, 2021
./x.py test --bless
1 parent e4efccd commit 62366ee

24 files changed

+16
-1528
lines changed
 

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt.-------.InstrumentCoverage.0.html

Lines changed: 0 additions & 92 deletions
This file was deleted.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ struct Error;
77
enum Enum {
88
A {
99
x: Error //~ ERROR can't compare `Error` with `Error`
10-
//~| ERROR can't compare `Error` with `Error`
11-
//~| ERROR can't compare `Error` with `Error`
12-
//~| ERROR can't compare `Error` with `Error`
13-
//~| ERROR can't compare `Error` with `Error`
1410
}
1511
}
1612

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

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,6 @@ LL | x: Error
88
= note: required by `std::cmp::PartialOrd::partial_cmp`
99
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
1010

11-
error[E0277]: can't compare `Error` with `Error`
12-
--> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:9:6
13-
|
14-
LL | x: Error
15-
| ^^^^^^^^ no implementation for `Error < Error` and `Error > Error`
16-
|
17-
= help: the trait `PartialOrd` is not implemented for `Error`
18-
= note: required by `std::cmp::PartialOrd::partial_cmp`
19-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
20-
21-
error[E0277]: can't compare `Error` with `Error`
22-
--> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:9:6
23-
|
24-
LL | x: Error
25-
| ^^^^^^^^ no implementation for `Error < Error` and `Error > Error`
26-
|
27-
= help: the trait `PartialOrd` is not implemented for `Error`
28-
= note: required by `std::cmp::PartialOrd::partial_cmp`
29-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
30-
31-
error[E0277]: can't compare `Error` with `Error`
32-
--> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:9:6
33-
|
34-
LL | x: Error
35-
| ^^^^^^^^ no implementation for `Error < Error` and `Error > Error`
36-
|
37-
= help: the trait `PartialOrd` is not implemented for `Error`
38-
= note: required by `std::cmp::PartialOrd::partial_cmp`
39-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
40-
41-
error[E0277]: can't compare `Error` with `Error`
42-
--> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:9:6
43-
|
44-
LL | x: Error
45-
| ^^^^^^^^ no implementation for `Error < Error` and `Error > Error`
46-
|
47-
= help: the trait `PartialOrd` is not implemented for `Error`
48-
= note: required by `std::cmp::PartialOrd::partial_cmp`
49-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
50-
51-
error: aborting due to 5 previous errors
11+
error: aborting due to previous error
5212

5313
For more information about this error, try `rustc --explain E0277`.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ struct Error;
77
enum Enum {
88
A(
99
Error //~ ERROR can't compare `Error` with `Error`
10-
//~| ERROR can't compare `Error` with `Error`
11-
//~| ERROR can't compare `Error` with `Error`
12-
//~| ERROR can't compare `Error` with `Error`
13-
//~| ERROR can't compare `Error` with `Error`
1410
)
1511
}
1612

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

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,6 @@ LL | Error
88
= note: required by `std::cmp::PartialOrd::partial_cmp`
99
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
1010

11-
error[E0277]: can't compare `Error` with `Error`
12-
--> $DIR/derives-span-PartialOrd-enum.rs:9:6
13-
|
14-
LL | Error
15-
| ^^^^^ no implementation for `Error < Error` and `Error > Error`
16-
|
17-
= help: the trait `PartialOrd` is not implemented for `Error`
18-
= note: required by `std::cmp::PartialOrd::partial_cmp`
19-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
20-
21-
error[E0277]: can't compare `Error` with `Error`
22-
--> $DIR/derives-span-PartialOrd-enum.rs:9:6
23-
|
24-
LL | Error
25-
| ^^^^^ no implementation for `Error < Error` and `Error > Error`
26-
|
27-
= help: the trait `PartialOrd` is not implemented for `Error`
28-
= note: required by `std::cmp::PartialOrd::partial_cmp`
29-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
30-
31-
error[E0277]: can't compare `Error` with `Error`
32-
--> $DIR/derives-span-PartialOrd-enum.rs:9:6
33-
|
34-
LL | Error
35-
| ^^^^^ no implementation for `Error < Error` and `Error > Error`
36-
|
37-
= help: the trait `PartialOrd` is not implemented for `Error`
38-
= note: required by `std::cmp::PartialOrd::partial_cmp`
39-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
40-
41-
error[E0277]: can't compare `Error` with `Error`
42-
--> $DIR/derives-span-PartialOrd-enum.rs:9:6
43-
|
44-
LL | Error
45-
| ^^^^^ no implementation for `Error < Error` and `Error > Error`
46-
|
47-
= help: the trait `PartialOrd` is not implemented for `Error`
48-
= note: required by `std::cmp::PartialOrd::partial_cmp`
49-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
50-
51-
error: aborting due to 5 previous errors
11+
error: aborting due to previous error
5212

5313
For more information about this error, try `rustc --explain E0277`.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ struct Error;
66
#[derive(PartialOrd,PartialEq)]
77
struct Struct {
88
x: Error //~ ERROR can't compare `Error` with `Error`
9-
//~| ERROR can't compare `Error` with `Error`
10-
//~| ERROR can't compare `Error` with `Error`
11-
//~| ERROR can't compare `Error` with `Error`
12-
//~| ERROR can't compare `Error` with `Error`
139
}
1410

1511
fn main() {}

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

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,6 @@ LL | x: Error
88
= note: required by `std::cmp::PartialOrd::partial_cmp`
99
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
1010

11-
error[E0277]: can't compare `Error` with `Error`
12-
--> $DIR/derives-span-PartialOrd-struct.rs:8:5
13-
|
14-
LL | x: Error
15-
| ^^^^^^^^ no implementation for `Error < Error` and `Error > Error`
16-
|
17-
= help: the trait `PartialOrd` is not implemented for `Error`
18-
= note: required by `std::cmp::PartialOrd::partial_cmp`
19-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
20-
21-
error[E0277]: can't compare `Error` with `Error`
22-
--> $DIR/derives-span-PartialOrd-struct.rs:8:5
23-
|
24-
LL | x: Error
25-
| ^^^^^^^^ no implementation for `Error < Error` and `Error > Error`
26-
|
27-
= help: the trait `PartialOrd` is not implemented for `Error`
28-
= note: required by `std::cmp::PartialOrd::partial_cmp`
29-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
30-
31-
error[E0277]: can't compare `Error` with `Error`
32-
--> $DIR/derives-span-PartialOrd-struct.rs:8:5
33-
|
34-
LL | x: Error
35-
| ^^^^^^^^ no implementation for `Error < Error` and `Error > Error`
36-
|
37-
= help: the trait `PartialOrd` is not implemented for `Error`
38-
= note: required by `std::cmp::PartialOrd::partial_cmp`
39-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
40-
41-
error[E0277]: can't compare `Error` with `Error`
42-
--> $DIR/derives-span-PartialOrd-struct.rs:8:5
43-
|
44-
LL | x: Error
45-
| ^^^^^^^^ no implementation for `Error < Error` and `Error > Error`
46-
|
47-
= help: the trait `PartialOrd` is not implemented for `Error`
48-
= note: required by `std::cmp::PartialOrd::partial_cmp`
49-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
50-
51-
error: aborting due to 5 previous errors
11+
error: aborting due to previous error
5212

5313
For more information about this error, try `rustc --explain E0277`.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ struct Error;
66
#[derive(PartialOrd,PartialEq)]
77
struct Struct(
88
Error //~ ERROR can't compare `Error` with `Error`
9-
//~| ERROR can't compare `Error` with `Error`
10-
//~| ERROR can't compare `Error` with `Error`
11-
//~| ERROR can't compare `Error` with `Error`
12-
//~| ERROR can't compare `Error` with `Error`
139
);
1410

1511
fn main() {}

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

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,6 @@ LL | Error
88
= note: required by `std::cmp::PartialOrd::partial_cmp`
99
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
1010

11-
error[E0277]: can't compare `Error` with `Error`
12-
--> $DIR/derives-span-PartialOrd-tuple-struct.rs:8:5
13-
|
14-
LL | Error
15-
| ^^^^^ no implementation for `Error < Error` and `Error > Error`
16-
|
17-
= help: the trait `PartialOrd` is not implemented for `Error`
18-
= note: required by `std::cmp::PartialOrd::partial_cmp`
19-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
20-
21-
error[E0277]: can't compare `Error` with `Error`
22-
--> $DIR/derives-span-PartialOrd-tuple-struct.rs:8:5
23-
|
24-
LL | Error
25-
| ^^^^^ no implementation for `Error < Error` and `Error > Error`
26-
|
27-
= help: the trait `PartialOrd` is not implemented for `Error`
28-
= note: required by `std::cmp::PartialOrd::partial_cmp`
29-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
30-
31-
error[E0277]: can't compare `Error` with `Error`
32-
--> $DIR/derives-span-PartialOrd-tuple-struct.rs:8:5
33-
|
34-
LL | Error
35-
| ^^^^^ no implementation for `Error < Error` and `Error > Error`
36-
|
37-
= help: the trait `PartialOrd` is not implemented for `Error`
38-
= note: required by `std::cmp::PartialOrd::partial_cmp`
39-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
40-
41-
error[E0277]: can't compare `Error` with `Error`
42-
--> $DIR/derives-span-PartialOrd-tuple-struct.rs:8:5
43-
|
44-
LL | Error
45-
| ^^^^^ no implementation for `Error < Error` and `Error > Error`
46-
|
47-
= help: the trait `PartialOrd` is not implemented for `Error`
48-
= note: required by `std::cmp::PartialOrd::partial_cmp`
49-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
50-
51-
error: aborting due to 5 previous errors
11+
error: aborting due to previous error
5212

5313
For more information about this error, try `rustc --explain E0277`.

‎src/test/ui/issues/issue-34229.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#[derive(PartialEq)] struct Comparable;
22
#[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
33
//~^ ERROR can't compare `Comparable`
4-
//~| ERROR can't compare `Comparable`
5-
//~| ERROR can't compare `Comparable`
6-
//~| ERROR can't compare `Comparable`
7-
//~| ERROR can't compare `Comparable`
84

95
fn main() {}

‎src/test/ui/issues/issue-34229.stderr

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,6 @@ LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
88
= note: required by `std::cmp::PartialOrd::partial_cmp`
99
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
1010

11-
error[E0277]: can't compare `Comparable` with `Comparable`
12-
--> $DIR/issue-34229.rs:2:46
13-
|
14-
LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
15-
| ^^^^^^^^^^ no implementation for `Comparable < Comparable` and `Comparable > Comparable`
16-
|
17-
= help: the trait `PartialOrd` is not implemented for `Comparable`
18-
= note: required by `std::cmp::PartialOrd::partial_cmp`
19-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
20-
21-
error[E0277]: can't compare `Comparable` with `Comparable`
22-
--> $DIR/issue-34229.rs:2:46
23-
|
24-
LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
25-
| ^^^^^^^^^^ no implementation for `Comparable < Comparable` and `Comparable > Comparable`
26-
|
27-
= help: the trait `PartialOrd` is not implemented for `Comparable`
28-
= note: required by `std::cmp::PartialOrd::partial_cmp`
29-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
30-
31-
error[E0277]: can't compare `Comparable` with `Comparable`
32-
--> $DIR/issue-34229.rs:2:46
33-
|
34-
LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
35-
| ^^^^^^^^^^ no implementation for `Comparable < Comparable` and `Comparable > Comparable`
36-
|
37-
= help: the trait `PartialOrd` is not implemented for `Comparable`
38-
= note: required by `std::cmp::PartialOrd::partial_cmp`
39-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
40-
41-
error[E0277]: can't compare `Comparable` with `Comparable`
42-
--> $DIR/issue-34229.rs:2:46
43-
|
44-
LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
45-
| ^^^^^^^^^^ no implementation for `Comparable < Comparable` and `Comparable > Comparable`
46-
|
47-
= help: the trait `PartialOrd` is not implemented for `Comparable`
48-
= note: required by `std::cmp::PartialOrd::partial_cmp`
49-
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
50-
51-
error: aborting due to 5 previous errors
11+
error: aborting due to previous error
5212

5313
For more information about this error, try `rustc --explain E0277`.

‎src/test/ui/range/range_traits-1.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,21 @@ use std::ops::*;
44
struct AllTheRanges {
55
a: Range<usize>,
66
//~^ ERROR can't compare
7-
//~| ERROR can't compare
8-
//~| ERROR can't compare
9-
//~| ERROR can't compare
10-
//~| ERROR can't compare
117
//~| ERROR Ord
128
b: RangeTo<usize>,
139
//~^ ERROR can't compare
14-
//~| ERROR can't compare
15-
//~| ERROR can't compare
16-
//~| ERROR can't compare
17-
//~| ERROR can't compare
1810
//~| ERROR Ord
1911
c: RangeFrom<usize>,
2012
//~^ ERROR can't compare
21-
//~| ERROR can't compare
22-
//~| ERROR can't compare
23-
//~| ERROR can't compare
24-
//~| ERROR can't compare
2513
//~| ERROR Ord
2614
d: RangeFull,
2715
//~^ ERROR can't compare
28-
//~| ERROR can't compare
29-
//~| ERROR can't compare
30-
//~| ERROR can't compare
31-
//~| ERROR can't compare
3216
//~| ERROR Ord
3317
e: RangeInclusive<usize>,
3418
//~^ ERROR can't compare
35-
//~| ERROR can't compare
36-
//~| ERROR can't compare
37-
//~| ERROR can't compare
38-
//~| ERROR can't compare
3919
//~| ERROR Ord
4020
f: RangeToInclusive<usize>,
4121
//~^ ERROR can't compare
42-
//~| ERROR can't compare
43-
//~| ERROR can't compare
44-
//~| ERROR can't compare
45-
//~| ERROR can't compare
4622
//~| ERROR Ord
4723
}
4824

‎src/test/ui/range/range_traits-1.stderr

Lines changed: 11 additions & 251 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.