From e3c2f8fc57e718f4ba1d7f52405eb2c1cb434559 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Mon, 30 Dec 2019 01:37:14 +0100 Subject: [PATCH] slice_patterns: organize some tests --- .../slice-pat-type-mismatches.rs} | 0 .../slice-pat-type-mismatches.stderr} | 10 +++++----- .../subslice-only-once-semantic-restriction.rs} | 0 .../subslice-only-once-semantic-restriction.stderr} | 6 +++--- .../issue-53820-slice-pattern-large-array.rs | 2 +- ...issue-65413-constants-and-slices-exhaustiveness.rs} | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename src/test/ui/{match/match-vec-mismatch.rs => array-slice-vec/slice-pat-type-mismatches.rs} (100%) rename src/test/ui/{match/match-vec-mismatch.stderr => array-slice-vec/slice-pat-type-mismatches.stderr} (81%) rename src/test/ui/{parser/match-vec-invalid.rs => array-slice-vec/subslice-only-once-semantic-restriction.rs} (100%) rename src/test/ui/{parser/match-vec-invalid.stderr => array-slice-vec/subslice-only-once-semantic-restriction.stderr} (80%) rename src/test/ui/pattern/{ => usefulness}/issue-53820-slice-pattern-large-array.rs (65%) rename src/test/ui/pattern/usefulness/{65413-constants-and-slices-exhaustiveness.rs => issue-65413-constants-and-slices-exhaustiveness.rs} (100%) diff --git a/src/test/ui/match/match-vec-mismatch.rs b/src/test/ui/array-slice-vec/slice-pat-type-mismatches.rs similarity index 100% rename from src/test/ui/match/match-vec-mismatch.rs rename to src/test/ui/array-slice-vec/slice-pat-type-mismatches.rs diff --git a/src/test/ui/match/match-vec-mismatch.stderr b/src/test/ui/array-slice-vec/slice-pat-type-mismatches.stderr similarity index 81% rename from src/test/ui/match/match-vec-mismatch.stderr rename to src/test/ui/array-slice-vec/slice-pat-type-mismatches.stderr index 4b0e429e51ca5..c4548142c13ef 100644 --- a/src/test/ui/match/match-vec-mismatch.stderr +++ b/src/test/ui/array-slice-vec/slice-pat-type-mismatches.stderr @@ -1,29 +1,29 @@ error[E0425]: cannot find value `does_not_exist` in this scope - --> $DIR/match-vec-mismatch.rs:26:11 + --> $DIR/slice-pat-type-mismatches.rs:26:11 | LL | match does_not_exist { | ^^^^^^^^^^^^^^ not found in this scope error[E0529]: expected an array or slice, found `std::string::String` - --> $DIR/match-vec-mismatch.rs:3:9 + --> $DIR/slice-pat-type-mismatches.rs:3:9 | LL | ['f', 'o', ..] => {} | ^^^^^^^^^^^^^^ pattern cannot match with input type `std::string::String` error[E0527]: pattern requires 1 element but array has 3 - --> $DIR/match-vec-mismatch.rs:18:9 + --> $DIR/slice-pat-type-mismatches.rs:18:9 | LL | [0] => {}, | ^^^ expected 3 elements error[E0528]: pattern requires at least 4 elements but array has 3 - --> $DIR/match-vec-mismatch.rs:23:9 + --> $DIR/slice-pat-type-mismatches.rs:23:9 | LL | [0, 1, 2, 3, x @ ..] => {} | ^^^^^^^^^^^^^^^^^^^^ pattern cannot match array of 3 elements error[E0282]: type annotations needed - --> $DIR/match-vec-mismatch.rs:34:9 + --> $DIR/slice-pat-type-mismatches.rs:34:9 | LL | [] => {} | ^^ cannot infer type diff --git a/src/test/ui/parser/match-vec-invalid.rs b/src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.rs similarity index 100% rename from src/test/ui/parser/match-vec-invalid.rs rename to src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.rs diff --git a/src/test/ui/parser/match-vec-invalid.stderr b/src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.stderr similarity index 80% rename from src/test/ui/parser/match-vec-invalid.stderr rename to src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.stderr index 1dc11c31905c4..4d6078788b228 100644 --- a/src/test/ui/parser/match-vec-invalid.stderr +++ b/src/test/ui/array-slice-vec/subslice-only-once-semantic-restriction.stderr @@ -1,11 +1,11 @@ error[E0416]: identifier `tail` is bound more than once in the same pattern - --> $DIR/match-vec-invalid.rs:4:24 + --> $DIR/subslice-only-once-semantic-restriction.rs:4:24 | LL | [1, tail @ .., tail @ ..] => {}, | ^^^^ used in a pattern more than once error: `..` can only be used once per slice pattern - --> $DIR/match-vec-invalid.rs:4:31 + --> $DIR/subslice-only-once-semantic-restriction.rs:4:31 | LL | [1, tail @ .., tail @ ..] => {}, | -- ^^ can only be used once per slice pattern @@ -13,7 +13,7 @@ LL | [1, tail @ .., tail @ ..] => {}, | previously used here error[E0308]: mismatched types - --> $DIR/match-vec-invalid.rs:11:30 + --> $DIR/subslice-only-once-semantic-restriction.rs:11:30 | LL | const RECOVERY_WITNESS: () = 0; | ^ expected `()`, found integer diff --git a/src/test/ui/pattern/issue-53820-slice-pattern-large-array.rs b/src/test/ui/pattern/usefulness/issue-53820-slice-pattern-large-array.rs similarity index 65% rename from src/test/ui/pattern/issue-53820-slice-pattern-large-array.rs rename to src/test/ui/pattern/usefulness/issue-53820-slice-pattern-large-array.rs index 1249329206112..5b0482de2200e 100644 --- a/src/test/ui/pattern/issue-53820-slice-pattern-large-array.rs +++ b/src/test/ui/pattern/usefulness/issue-53820-slice-pattern-large-array.rs @@ -1,6 +1,6 @@ // check-pass -// This used to cause a stack overflow in the compiler. +// This used to cause a stack overflow during exhaustiveness checking in the compiler. fn main() { const LARGE_SIZE: usize = 1024 * 1024; diff --git a/src/test/ui/pattern/usefulness/65413-constants-and-slices-exhaustiveness.rs b/src/test/ui/pattern/usefulness/issue-65413-constants-and-slices-exhaustiveness.rs similarity index 100% rename from src/test/ui/pattern/usefulness/65413-constants-and-slices-exhaustiveness.rs rename to src/test/ui/pattern/usefulness/issue-65413-constants-and-slices-exhaustiveness.rs