Skip to content

Commit

Permalink
[WIP] fix tests after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicholas Matsakis committed Dec 14, 2019
1 parent 428579c commit 19d18d2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 47 deletions.
32 changes: 0 additions & 32 deletions src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
View file
@@ -1,61 +1,29 @@
<<<<<<< HEAD
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedEnum` is non-empty
--> $DIR/indirect_match.rs:18:11
||||||| parent of bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedEnum` of type `uninhabited::IndirectUninhabitedEnum` is not handled
--> $DIR/indirect_match.rs:18:11
=======
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedEnum` of type `uninhabited::IndirectUninhabitedEnum` is not handled
--> $DIR/indirect_match.rs:19:11
>>>>>>> bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
|
LL | match x {}
| ^
|
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

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

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

<<<<<<< HEAD
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedVariants` is non-empty
--> $DIR/indirect_match.rs:32:11
||||||| parent of bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedVariants` of type `uninhabited::IndirectUninhabitedVariants` is not handled
--> $DIR/indirect_match.rs:32:11
=======
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedVariants` of type `uninhabited::IndirectUninhabitedVariants` is not handled
--> $DIR/indirect_match.rs:33:11
>>>>>>> bca33d7df4a... Revert "Remove `#![feature(never_type)]` from tests."
|
LL | match x {}
| ^
Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
View file
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedEnum` is non-empty
--> $DIR/indirect_match_same_crate.rs:32:11
--> $DIR/indirect_match_same_crate.rs:34:11
|
LL | pub struct IndirectUninhabitedEnum(UninhabitedEnum);
| ---------------------------------------------------- `IndirectUninhabitedEnum` defined here
Expand All @@ -10,7 +10,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

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

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

error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedVariants` is non-empty
--> $DIR/indirect_match_same_crate.rs:46:11
--> $DIR/indirect_match_same_crate.rs:48:11
|
LL | pub struct IndirectUninhabitedVariants(UninhabitedVariants);
| ------------------------------------------------------------ `IndirectUninhabitedVariants` defined here
Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr
View file
@@ -1,29 +1,29 @@
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedEnum` is non-empty
--> $DIR/match.rs:18:11
--> $DIR/match.rs:19:11
|
LL | match x {}
| ^
|
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

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

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

error[E0004]: non-exhaustive patterns: `Tuple(_)` and `Struct { .. }` not covered
--> $DIR/match.rs:30:11
--> $DIR/match.rs:31:11
|
LL | match x {}
| ^ patterns `Tuple(_)` and `Struct { .. }` not covered
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
View file
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: type `UninhabitedStruct` is non-empty
--> $DIR/match_same_crate.rs:28:11
--> $DIR/match_same_crate.rs:30:11
|
LL | / pub struct UninhabitedStruct {
LL | | _priv: !,
Expand All @@ -12,7 +12,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

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

error[E0004]: non-exhaustive patterns: `Tuple(_)` and `Struct { .. }` not covered
--> $DIR/match_same_crate.rs:36:11
--> $DIR/match_same_crate.rs:38:11
|
LL | / pub enum UninhabitedVariants {
LL | | #[non_exhaustive] Tuple(!),
Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
View file
@@ -1,29 +1,29 @@
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedEnum` is non-empty
--> $DIR/match_with_exhaustive_patterns.rs:21:11
--> $DIR/match_with_exhaustive_patterns.rs:22:11
|
LL | match x {}
| ^
|
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

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

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

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

0 comments on commit 19d18d2

Please sign in to comment.