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 19d18d2

Browse files
author
Nicholas Matsakis
committedDec 14, 2019
[WIP] fix tests after rebase
1 parent 428579c commit 19d18d2

File tree

5 files changed

+15
-47
lines changed

5 files changed

+15
-47
lines changed
 

‎src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,29 @@
1-
<<<<<<< HEAD
21
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedEnum` is non-empty
3-
--> $DIR/indirect_match.rs:18:11
4-
||||||| parent of bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
5-
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedEnum` of type `uninhabited::IndirectUninhabitedEnum` is not handled
6-
--> $DIR/indirect_match.rs:18:11
7-
=======
8-
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedEnum` of type `uninhabited::IndirectUninhabitedEnum` is not handled
92
--> $DIR/indirect_match.rs:19:11
10-
>>>>>>> bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
113
|
124
LL | match x {}
135
| ^
146
|
157
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
168

17-
<<<<<<< HEAD
189
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedStruct` is non-empty
19-
--> $DIR/indirect_match.rs:22:11
20-
||||||| parent of bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
21-
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedStruct` of type `uninhabited::IndirectUninhabitedStruct` is not handled
22-
--> $DIR/indirect_match.rs:22:11
23-
=======
24-
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedStruct` of type `uninhabited::IndirectUninhabitedStruct` is not handled
2510
--> $DIR/indirect_match.rs:23:11
26-
>>>>>>> bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
2711
|
2812
LL | match x {}
2913
| ^
3014
|
3115
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
3216

33-
<<<<<<< HEAD
3417
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedTupleStruct` is non-empty
35-
--> $DIR/indirect_match.rs:26:11
36-
||||||| parent of bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
37-
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedTupleStruct` of type `uninhabited::IndirectUninhabitedTupleStruct` is not handled
38-
--> $DIR/indirect_match.rs:26:11
39-
=======
40-
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedTupleStruct` of type `uninhabited::IndirectUninhabitedTupleStruct` is not handled
4118
--> $DIR/indirect_match.rs:27:11
42-
>>>>>>> bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
4319
|
4420
LL | match x {}
4521
| ^
4622
|
4723
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
4824

49-
<<<<<<< HEAD
5025
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedVariants` is non-empty
51-
--> $DIR/indirect_match.rs:32:11
52-
||||||| parent of bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
53-
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedVariants` of type `uninhabited::IndirectUninhabitedVariants` is not handled
54-
--> $DIR/indirect_match.rs:32:11
55-
=======
56-
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedVariants` of type `uninhabited::IndirectUninhabitedVariants` is not handled
5726
--> $DIR/indirect_match.rs:33:11
58-
>>>>>>> bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
5927
|
6028
LL | match x {}
6129
| ^

‎src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedEnum` is non-empty
2-
--> $DIR/indirect_match_same_crate.rs:32:11
2+
--> $DIR/indirect_match_same_crate.rs:34:11
33
|
44
LL | pub struct IndirectUninhabitedEnum(UninhabitedEnum);
55
| ---------------------------------------------------- `IndirectUninhabitedEnum` defined here
@@ -10,7 +10,7 @@ LL | match x {}
1010
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
1111

1212
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedStruct` is non-empty
13-
--> $DIR/indirect_match_same_crate.rs:36:11
13+
--> $DIR/indirect_match_same_crate.rs:38:11
1414
|
1515
LL | pub struct IndirectUninhabitedStruct(UninhabitedStruct);
1616
| -------------------------------------------------------- `IndirectUninhabitedStruct` defined here
@@ -21,7 +21,7 @@ LL | match x {}
2121
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2222

2323
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedTupleStruct` is non-empty
24-
--> $DIR/indirect_match_same_crate.rs:40:11
24+
--> $DIR/indirect_match_same_crate.rs:42:11
2525
|
2626
LL | pub struct IndirectUninhabitedTupleStruct(UninhabitedTupleStruct);
2727
| ------------------------------------------------------------------ `IndirectUninhabitedTupleStruct` defined here
@@ -32,7 +32,7 @@ LL | match x {}
3232
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
3333

3434
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedVariants` is non-empty
35-
--> $DIR/indirect_match_same_crate.rs:46:11
35+
--> $DIR/indirect_match_same_crate.rs:48:11
3636
|
3737
LL | pub struct IndirectUninhabitedVariants(UninhabitedVariants);
3838
| ------------------------------------------------------------ `IndirectUninhabitedVariants` defined here

‎src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedEnum` is non-empty
2-
--> $DIR/match.rs:18:11
2+
--> $DIR/match.rs:19:11
33
|
44
LL | match x {}
55
| ^
66
|
77
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
88

99
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedStruct` is non-empty
10-
--> $DIR/match.rs:22:11
10+
--> $DIR/match.rs:23:11
1111
|
1212
LL | match x {}
1313
| ^
1414
|
1515
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
1616

1717
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedTupleStruct` is non-empty
18-
--> $DIR/match.rs:26:11
18+
--> $DIR/match.rs:27:11
1919
|
2020
LL | match x {}
2121
| ^
2222
|
2323
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2424

2525
error[E0004]: non-exhaustive patterns: `Tuple(_)` and `Struct { .. }` not covered
26-
--> $DIR/match.rs:30:11
26+
--> $DIR/match.rs:31:11
2727
|
2828
LL | match x {}
2929
| ^ patterns `Tuple(_)` and `Struct { .. }` not covered

‎src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0004]: non-exhaustive patterns: type `UninhabitedStruct` is non-empty
2-
--> $DIR/match_same_crate.rs:28:11
2+
--> $DIR/match_same_crate.rs:30:11
33
|
44
LL | / pub struct UninhabitedStruct {
55
LL | | _priv: !,
@@ -12,7 +12,7 @@ LL | match x {}
1212
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
1313

1414
error[E0004]: non-exhaustive patterns: type `UninhabitedTupleStruct` is non-empty
15-
--> $DIR/match_same_crate.rs:32:11
15+
--> $DIR/match_same_crate.rs:34:11
1616
|
1717
LL | pub struct UninhabitedTupleStruct(!);
1818
| ------------------------------------- `UninhabitedTupleStruct` defined here
@@ -23,7 +23,7 @@ LL | match x {}
2323
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2424

2525
error[E0004]: non-exhaustive patterns: `Tuple(_)` and `Struct { .. }` not covered
26-
--> $DIR/match_same_crate.rs:36:11
26+
--> $DIR/match_same_crate.rs:38:11
2727
|
2828
LL | / pub enum UninhabitedVariants {
2929
LL | | #[non_exhaustive] Tuple(!),

‎src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedEnum` is non-empty
2-
--> $DIR/match_with_exhaustive_patterns.rs:21:11
2+
--> $DIR/match_with_exhaustive_patterns.rs:22:11
33
|
44
LL | match x {}
55
| ^
66
|
77
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
88

99
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedStruct` is non-empty
10-
--> $DIR/match_with_exhaustive_patterns.rs:25:11
10+
--> $DIR/match_with_exhaustive_patterns.rs:26:11
1111
|
1212
LL | match x {}
1313
| ^
1414
|
1515
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
1616

1717
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedTupleStruct` is non-empty
18-
--> $DIR/match_with_exhaustive_patterns.rs:29:11
18+
--> $DIR/match_with_exhaustive_patterns.rs:30:11
1919
|
2020
LL | match x {}
2121
| ^
2222
|
2323
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2424

2525
error[E0004]: non-exhaustive patterns: `Tuple(_)` and `Struct { .. }` not covered
26-
--> $DIR/match_with_exhaustive_patterns.rs:33:11
26+
--> $DIR/match_with_exhaustive_patterns.rs:34:11
2727
|
2828
LL | match x {}
2929
| ^ patterns `Tuple(_)` and `Struct { .. }` not covered

0 commit comments

Comments
 (0)
Please sign in to comment.