Rollup merge of #65880 - Nadrieril:gather-usefulness-tests, r=varkor

Gather together usefulness tests I took most tests that were testing only for match exhaustiveness, pattern refutability or match arm reachability, and put them in the same test folder. I found it helpful to have them all in the same place when working on the usefulness algorithm.
rust-lang · Oct 28, 2019 · 606743e · 606743e
2 parents 75a127c + 09f9947
commit 606743e
Show file tree

Hide file tree

Showing 55 changed files with 6 additions and 3 deletions.
diff --git a/src/librustc_mir/hair/pattern/_match.rs b/src/librustc_mir/hair/pattern/_match.rs
@@ -1,3 +1,6 @@
+/// Note: most tests relevant to this file can be found (at the time of writing)
+/// in src/tests/ui/pattern/usefulness.
+///
 /// This file includes the logic for exhaustiveness and usefulness checking for
 /// pattern-matching. Specifically, given a list of patterns for a type, we can
 /// tell whether:

diff --git a/...uninhabited/always-inhabited-union-ref.rs → .../usefulness/always-inhabited-union-ref.rs b/...uninhabited/always-inhabited-union-ref.rs → .../usefulness/always-inhabited-union-ref.rs
diff --git a/...habited/always-inhabited-union-ref.stderr → ...fulness/always-inhabited-union-ref.stderr b/...habited/always-inhabited-union-ref.stderr → ...fulness/always-inhabited-union-ref.stderr
diff --git a/src/test/ui/exhaustive_integer_patterns.rs → ...usefulness/exhaustive_integer_patterns.rs b/src/test/ui/exhaustive_integer_patterns.rs → ...usefulness/exhaustive_integer_patterns.rs
diff --git a/...est/ui/exhaustive_integer_patterns.stderr → ...ulness/exhaustive_integer_patterns.stderr b/...est/ui/exhaustive_integer_patterns.stderr → ...ulness/exhaustive_integer_patterns.stderr
diff --git a/src/test/ui/guards-not-exhaustive.rs → ...ttern/usefulness/guards-not-exhaustive.rs b/src/test/ui/guards-not-exhaustive.rs → ...ttern/usefulness/guards-not-exhaustive.rs
diff --git a/...irrefutable-exhaustive-integer-binding.rs → ...irrefutable-exhaustive-integer-binding.rs b/...irrefutable-exhaustive-integer-binding.rs → ...irrefutable-exhaustive-integer-binding.rs
diff --git a/src/test/ui/irrefutable-unit.rs → ...ui/pattern/usefulness/irrefutable-unit.rs b/src/test/ui/irrefutable-unit.rs → ...ui/pattern/usefulness/irrefutable-unit.rs
diff --git a/src/test/ui/check_match/issue-35609.rs → ...test/ui/pattern/usefulness/issue-35609.rs b/src/test/ui/check_match/issue-35609.rs → ...test/ui/pattern/usefulness/issue-35609.rs
diff --git a/src/test/ui/check_match/issue-35609.stderr → .../ui/pattern/usefulness/issue-35609.stderr b/src/test/ui/check_match/issue-35609.stderr → .../ui/pattern/usefulness/issue-35609.stderr
diff --git a/src/test/ui/check_match/issue-43253.rs → ...test/ui/pattern/usefulness/issue-43253.rs b/src/test/ui/check_match/issue-43253.rs → ...test/ui/pattern/usefulness/issue-43253.rs
diff --git a/src/test/ui/check_match/issue-43253.stderr → .../ui/pattern/usefulness/issue-43253.stderr b/src/test/ui/check_match/issue-43253.stderr → .../ui/pattern/usefulness/issue-43253.stderr
diff --git a/src/test/ui/match/match-argm-statics-2.rs → ...pattern/usefulness/match-arm-statics-2.rs b/src/test/ui/match/match-argm-statics-2.rs → ...pattern/usefulness/match-arm-statics-2.rs
diff --git a/...test/ui/match/match-argm-statics-2.stderr → ...ern/usefulness/match-arm-statics-2.stderr b/...test/ui/match/match-argm-statics-2.stderr → ...ern/usefulness/match-arm-statics-2.stderr
@@ -1,21 +1,21 @@
 error[E0004]: non-exhaustive patterns: `(true, false)` not covered
-  --> $DIR/match-argm-statics-2.rs:17:11
+  --> $DIR/match-arm-statics-2.rs:17:11
    |
 LL |     match (true, false) {
    |           ^^^^^^^^^^^^^ pattern `(true, false)` not covered
    |
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
 
 error[E0004]: non-exhaustive patterns: `Some(Some(West))` not covered
-  --> $DIR/match-argm-statics-2.rs:29:11
+  --> $DIR/match-arm-statics-2.rs:29:11
    |
 LL |     match Some(Some(North)) {
    |           ^^^^^^^^^^^^^^^^^ pattern `Some(Some(West))` not covered
    |
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
 
 error[E0004]: non-exhaustive patterns: `Foo { bar: Some(North), baz: NewBool(true) }` not covered
-  --> $DIR/match-argm-statics-2.rs:48:11
+  --> $DIR/match-arm-statics-2.rs:48:11
    |
 LL | / struct Foo {
 LL | |     bar: Option<Direction>,

diff --git a/src/test/ui/match/match-arm-statics.rs → ...i/pattern/usefulness/match-arm-statics.rs b/src/test/ui/match/match-arm-statics.rs → ...i/pattern/usefulness/match-arm-statics.rs
diff --git a/src/test/ui/match/match-arm-statics.stderr → ...ttern/usefulness/match-arm-statics.stderr b/src/test/ui/match/match-arm-statics.stderr → ...ttern/usefulness/match-arm-statics.stderr
diff --git a/...t/ui/match/match-byte-array-patterns-2.rs → ...usefulness/match-byte-array-patterns-2.rs b/...t/ui/match/match-byte-array-patterns-2.rs → ...usefulness/match-byte-array-patterns-2.rs
diff --git a/.../match/match-byte-array-patterns-2.stderr → ...ulness/match-byte-array-patterns-2.stderr b/.../match/match-byte-array-patterns-2.stderr → ...ulness/match-byte-array-patterns-2.stderr
diff --git a/...est/ui/match/match-byte-array-patterns.rs → ...n/usefulness/match-byte-array-patterns.rs b/...est/ui/match/match-byte-array-patterns.rs → ...n/usefulness/match-byte-array-patterns.rs
diff --git a/...ui/match/match-byte-array-patterns.stderr → ...efulness/match-byte-array-patterns.stderr b/...ui/match/match-byte-array-patterns.stderr → ...efulness/match-byte-array-patterns.stderr
diff --git a/src/test/ui/match/match-non-exhaustive.rs → ...attern/usefulness/match-non-exhaustive.rs b/src/test/ui/match/match-non-exhaustive.rs → ...attern/usefulness/match-non-exhaustive.rs
diff --git a/...test/ui/match/match-non-exhaustive.stderr → ...rn/usefulness/match-non-exhaustive.stderr b/...test/ui/match/match-non-exhaustive.stderr → ...rn/usefulness/match-non-exhaustive.stderr
diff --git a/src/test/ui/match/match-privately-empty.rs → ...ttern/usefulness/match-privately-empty.rs b/src/test/ui/match/match-privately-empty.rs → ...ttern/usefulness/match-privately-empty.rs
diff --git a/...est/ui/match/match-privately-empty.stderr → ...n/usefulness/match-privately-empty.stderr b/...est/ui/match/match-privately-empty.stderr → ...n/usefulness/match-privately-empty.stderr
diff --git a/...est/ui/match/match-range-fail-dominate.rs → ...n/usefulness/match-range-fail-dominate.rs b/...est/ui/match/match-range-fail-dominate.rs → ...n/usefulness/match-range-fail-dominate.rs
diff --git a/...ui/match/match-range-fail-dominate.stderr → ...efulness/match-range-fail-dominate.stderr b/...ui/match/match-range-fail-dominate.stderr → ...efulness/match-range-fail-dominate.stderr
diff --git a/src/test/ui/match/match-ref-ice.rs → ...st/ui/pattern/usefulness/match-ref-ice.rs b/src/test/ui/match/match-ref-ice.rs → ...st/ui/pattern/usefulness/match-ref-ice.rs
diff --git a/src/test/ui/match/match-ref-ice.stderr → ...i/pattern/usefulness/match-ref-ice.stderr b/src/test/ui/match/match-ref-ice.stderr → ...i/pattern/usefulness/match-ref-ice.stderr
diff --git a/src/test/ui/match/match-slice-patterns.rs → ...attern/usefulness/match-slice-patterns.rs b/src/test/ui/match/match-slice-patterns.rs → ...attern/usefulness/match-slice-patterns.rs
diff --git a/...test/ui/match/match-slice-patterns.stderr → ...rn/usefulness/match-slice-patterns.stderr b/...test/ui/match/match-slice-patterns.stderr → ...rn/usefulness/match-slice-patterns.stderr
diff --git a/src/test/ui/match/match-vec-fixed.rs → .../ui/pattern/usefulness/match-vec-fixed.rs b/src/test/ui/match/match-vec-fixed.rs → .../ui/pattern/usefulness/match-vec-fixed.rs
diff --git a/src/test/ui/match/match-vec-fixed.stderr → ...pattern/usefulness/match-vec-fixed.stderr b/src/test/ui/match/match-vec-fixed.stderr → ...pattern/usefulness/match-vec-fixed.stderr
diff --git a/src/test/ui/match/match-vec-unreachable.rs → ...ttern/usefulness/match-vec-unreachable.rs b/src/test/ui/match/match-vec-unreachable.rs → ...ttern/usefulness/match-vec-unreachable.rs
diff --git a/...est/ui/match/match-vec-unreachable.stderr → ...n/usefulness/match-vec-unreachable.stderr b/...est/ui/match/match-vec-unreachable.stderr → ...n/usefulness/match-vec-unreachable.stderr
diff --git a/...est/ui/binding/nested-exhaustive-match.rs → ...ern/usefulness/nested-exhaustive-match.rs b/...est/ui/binding/nested-exhaustive-match.rs → ...ern/usefulness/nested-exhaustive-match.rs
diff --git a/...t/ui/match/non-exhaustive-defined-here.rs → ...usefulness/non-exhaustive-defined-here.rs b/...t/ui/match/non-exhaustive-defined-here.rs → ...usefulness/non-exhaustive-defined-here.rs
diff --git a/.../match/non-exhaustive-defined-here.stderr → ...ulness/non-exhaustive-defined-here.stderr b/.../match/non-exhaustive-defined-here.stderr → ...ulness/non-exhaustive-defined-here.stderr
diff --git a/...stive/non-exhaustive-float-range-match.rs → ...lness/non-exhaustive-float-range-match.rs b/...stive/non-exhaustive-float-range-match.rs → ...lness/non-exhaustive-float-range-match.rs
diff --git a/...e/non-exhaustive-float-range-match.stderr → ...s/non-exhaustive-float-range-match.stderr b/...e/non-exhaustive-float-range-match.stderr → ...s/non-exhaustive-float-range-match.stderr
diff --git a/...exhaustive/non-exhaustive-match-nested.rs → ...usefulness/non-exhaustive-match-nested.rs b/...exhaustive/non-exhaustive-match-nested.rs → ...usefulness/non-exhaustive-match-nested.rs
diff --git a/...ustive/non-exhaustive-match-nested.stderr → ...ulness/non-exhaustive-match-nested.stderr b/...ustive/non-exhaustive-match-nested.stderr → ...ulness/non-exhaustive-match-nested.stderr
diff --git a/...ui/non-exhaustive/non-exhaustive-match.rs → ...attern/usefulness/non-exhaustive-match.rs b/...ui/non-exhaustive/non-exhaustive-match.rs → ...attern/usefulness/non-exhaustive-match.rs
diff --git a/...on-exhaustive/non-exhaustive-match.stderr → ...rn/usefulness/non-exhaustive-match.stderr b/...on-exhaustive/non-exhaustive-match.stderr → ...rn/usefulness/non-exhaustive-match.stderr
diff --git a/...austive/non-exhaustive-pattern-witness.rs → ...fulness/non-exhaustive-pattern-witness.rs b/...austive/non-exhaustive-pattern-witness.rs → ...fulness/non-exhaustive-pattern-witness.rs
diff --git a/...ive/non-exhaustive-pattern-witness.stderr → ...ess/non-exhaustive-pattern-witness.stderr b/...ive/non-exhaustive-pattern-witness.stderr → ...ess/non-exhaustive-pattern-witness.stderr
diff --git a/src/test/ui/refutable-pattern-errors.rs → ...rn/usefulness/refutable-pattern-errors.rs b/src/test/ui/refutable-pattern-errors.rs → ...rn/usefulness/refutable-pattern-errors.rs
diff --git a/src/test/ui/refutable-pattern-errors.stderr → ...sefulness/refutable-pattern-errors.stderr b/src/test/ui/refutable-pattern-errors.stderr → ...sefulness/refutable-pattern-errors.stderr
diff --git a/src/test/ui/refutable-pattern-in-fn-arg.rs → ...usefulness/refutable-pattern-in-fn-arg.rs b/src/test/ui/refutable-pattern-in-fn-arg.rs → ...usefulness/refutable-pattern-in-fn-arg.rs
diff --git a/...est/ui/refutable-pattern-in-fn-arg.stderr → ...ulness/refutable-pattern-in-fn-arg.stderr b/...est/ui/refutable-pattern-in-fn-arg.stderr → ...ulness/refutable-pattern-in-fn-arg.stderr
diff --git a/...structs/struct-like-enum-nonexhaustive.rs → ...fulness/struct-like-enum-nonexhaustive.rs b/...structs/struct-like-enum-nonexhaustive.rs → ...fulness/struct-like-enum-nonexhaustive.rs
diff --git a/...cts/struct-like-enum-nonexhaustive.stderr → ...ess/struct-like-enum-nonexhaustive.stderr b/...cts/struct-like-enum-nonexhaustive.stderr → ...ess/struct-like-enum-nonexhaustive.stderr
diff --git a/...i/structs/struct-pattern-match-useless.rs → ...sefulness/struct-pattern-match-useless.rs b/...i/structs/struct-pattern-match-useless.rs → ...sefulness/struct-pattern-match-useless.rs
diff --git a/...ructs/struct-pattern-match-useless.stderr → ...lness/struct-pattern-match-useless.stderr b/...ructs/struct-pattern-match-useless.stderr → ...lness/struct-pattern-match-useless.stderr
diff --git a/...st/ui/tuple/tuple-struct-nonexhaustive.rs → .../usefulness/tuple-struct-nonexhaustive.rs b/...st/ui/tuple/tuple-struct-nonexhaustive.rs → .../usefulness/tuple-struct-nonexhaustive.rs
diff --git a/...i/tuple/tuple-struct-nonexhaustive.stderr → ...fulness/tuple-struct-nonexhaustive.stderr b/...i/tuple/tuple-struct-nonexhaustive.stderr → ...fulness/tuple-struct-nonexhaustive.stderr