OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test(pattern): harden tests for or-patterns with slice-patterns

Browse Source 
Some of the nested OR paths were being missed
This commit is contained in:
Matthew Kuo 2020-03-04 01:33:32 -06:00
parent 5456114858
commit b4788a739b
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/ui/or-patterns/slice-patterns.rs
View File

@ -20,8 +20,8 @@ enum Test {
fn test(foo: &[Option<Test>]) -> MatchArm {
match foo {
[.., Some(Test::Foo | Test::Qux)] => MatchArm::Arm(0),
[Some(Test::Foo), .., Some(Test::Bar | Test::Baz)] => MatchArm::Arm(1),
[.., Some(Test::Qux | Test::Foo)] => MatchArm::Arm(0),
[Some(Test::Foo), .., Some(Test::Baz | Test::Bar)] => MatchArm::Arm(1),
[.., Some(Test::Bar | Test::Baz), _] => MatchArm::Arm(2),
_ => MatchArm::Wild,
}
@ -35,8 +35,18 @@ fn main() {
Some(Test::Qux),
];
// path 1a
assert_eq!(test(&foo), MatchArm::Arm(0));
// path 1b
assert_eq!(test(&[Some(Test::Bar), Some(Test::Foo)]), MatchArm::Arm(0));
// path 2a
assert_eq!(test(&foo[..3]), MatchArm::Arm(1));
// path 2b
assert_eq!(test(&[Some(Test::Foo), Some(Test::Foo), Some(Test::Bar)]), MatchArm::Arm(1));
// path 3a
assert_eq!(test(&foo[1..3]), MatchArm::Arm(2));
// path 3b
assert_eq!(test(&[Some(Test::Bar), Some(Test::Baz), Some(Test::Baz), Some(Test::Bar)]), MatchArm::Arm(2));
// path 4
assert_eq!(test(&foo[4..]), MatchArm::Wild);
}

17
src/test/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs
View File

@ -21,7 +21,7 @@ enum Test {
fn test(foo: &[Option<Test>]) -> MatchArm {
match foo {
bar @ [Some(Test::Foo), .., Some(Test::Foo | Test::Qux)] => {
bar @ [Some(Test::Foo), .., Some(Test::Qux | Test::Foo)] => {
assert_eq!(bar, foo);
MatchArm::Arm(0)
@ -36,8 +36,21 @@ fn test(foo: &[Option<Test>]) -> MatchArm {
}
fn main() {
let foo = vec![Some(Test::Foo), Some(Test::Bar), Some(Test::Baz), Some(Test::Qux)];
let foo = vec![
Some(Test::Foo),
Some(Test::Bar),
Some(Test::Baz),
Some(Test::Qux),
];
// path 1a
assert_eq!(test(&foo), MatchArm::Arm(0));
// path 1b
assert_eq!(test(&[Some(Test::Foo), Some(Test::Bar), Some(Test::Foo)]), MatchArm::Arm(0));
// path 2a
assert_eq!(test(&foo[..3]), MatchArm::Arm(1));
// path 2b
assert_eq!(test(&[Some(Test::Bar), Some(Test::Qux), Some(Test::Baz)]), MatchArm::Arm(1));
// path 3
assert_eq!(test(&foo[1..2]), MatchArm::Wild);
}