summaryrefslogtreecommitdiffstats
path: root/tests/ui/match
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ui/match')
-rw-r--r--tests/ui/match/guards-parenthesized-and.rs10
-rw-r--r--tests/ui/match/match-range-fail-2.rs9
-rw-r--r--tests/ui/match/match-range-fail-2.stderr24
3 files changed, 16 insertions, 27 deletions
diff --git a/tests/ui/match/guards-parenthesized-and.rs b/tests/ui/match/guards-parenthesized-and.rs
new file mode 100644
index 000000000..3a1c341f3
--- /dev/null
+++ b/tests/ui/match/guards-parenthesized-and.rs
@@ -0,0 +1,10 @@
+// check-pass
+
+fn main() {
+ let c = 1;
+ let w = "T";
+ match Some(5) {
+ None if c == 1 && (w != "Y" && w != "E") => {}
+ _ => panic!(),
+ }
+}
diff --git a/tests/ui/match/match-range-fail-2.rs b/tests/ui/match/match-range-fail-2.rs
index 792664e1d..4489cf1ab 100644
--- a/tests/ui/match/match-range-fail-2.rs
+++ b/tests/ui/match/match-range-fail-2.rs
@@ -3,22 +3,19 @@
fn main() {
match 5 {
6 ..= 1 => { }
+ //~^ ERROR lower range bound must be less than or equal to upper
_ => { }
};
- //~^^^ ERROR lower range bound must be less than or equal to upper
- //~| ERROR lower range bound must be less than or equal to upper
match 5 {
0 .. 0 => { }
+ //~^ ERROR lower range bound must be less than upper
_ => { }
};
- //~^^^ ERROR lower range bound must be less than upper
- //~| ERROR lower range bound must be less than upper
match 5u64 {
0xFFFF_FFFF_FFFF_FFFF ..= 1 => { }
+ //~^ ERROR lower range bound must be less than or equal to upper
_ => { }
};
- //~^^^ ERROR lower range bound must be less than or equal to upper
- //~| ERROR lower range bound must be less than or equal to upper
}
diff --git a/tests/ui/match/match-range-fail-2.stderr b/tests/ui/match/match-range-fail-2.stderr
index 7a0852d7e..52a2bf2b3 100644
--- a/tests/ui/match/match-range-fail-2.stderr
+++ b/tests/ui/match/match-range-fail-2.stderr
@@ -5,36 +5,18 @@ LL | 6 ..= 1 => { }
| ^ lower bound larger than upper bound
error[E0579]: lower range bound must be less than upper
- --> $DIR/match-range-fail-2.rs:12:9
+ --> $DIR/match-range-fail-2.rs:11:9
|
LL | 0 .. 0 => { }
| ^
error[E0030]: lower range bound must be less than or equal to upper
- --> $DIR/match-range-fail-2.rs:19:9
+ --> $DIR/match-range-fail-2.rs:17:9
|
LL | 0xFFFF_FFFF_FFFF_FFFF ..= 1 => { }
| ^^^^^^^^^^^^^^^^^^^^^ lower bound larger than upper bound
-error[E0030]: lower range bound must be less than or equal to upper
- --> $DIR/match-range-fail-2.rs:5:9
- |
-LL | 6 ..= 1 => { }
- | ^ lower bound larger than upper bound
-
-error[E0579]: lower range bound must be less than upper
- --> $DIR/match-range-fail-2.rs:12:9
- |
-LL | 0 .. 0 => { }
- | ^
-
-error[E0030]: lower range bound must be less than or equal to upper
- --> $DIR/match-range-fail-2.rs:19:9
- |
-LL | 0xFFFF_FFFF_FFFF_FFFF ..= 1 => { }
- | ^^^^^^^^^^^^^^^^^^^^^ lower bound larger than upper bound
-
-error: aborting due to 6 previous errors
+error: aborting due to 3 previous errors
Some errors have detailed explanations: E0030, E0579.
For more information about an error, try `rustc --explain E0030`.