Skip to content

Commit 464d5e7

Browse files
NadrierilNadrieril
committed
Prefer min_exhaustive_patterns in tests
1 parent e1df69a commit 464d5e7

20 files changed

+25
-24
lines changed

‎tests/ui/closures/2229_closure_analysis/run_pass/multivariant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// visibly uninhabited).
33
// edition:2021
44
// run-pass
5-
#![feature(exhaustive_patterns)]
5+
#![feature(min_exhaustive_patterns)]
66
#![feature(never_type)]
77

88
pub fn main() {

‎tests/ui/never_type/issue-44402.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![allow(dead_code)]
44
#![feature(never_type)]
5-
#![feature(exhaustive_patterns)]
5+
#![feature(min_exhaustive_patterns)]
66

77
// Regression test for inhabitedness check. The old
88
// cache used to cause us to incorrectly decide

‎tests/ui/pattern/usefulness/always-inhabited-union-ref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// The precise semantics of inhabitedness with respect to unions and references is currently
22
// undecided. This test file currently checks a conservative choice.
33

4-
#![feature(exhaustive_patterns)]
4+
#![feature(min_exhaustive_patterns)]
55
#![feature(never_type)]
66

77
#![allow(dead_code)]

‎tests/ui/pattern/usefulness/impl-trait.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(never_type)]
2-
#![feature(exhaustive_patterns)]
2+
#![feature(min_exhaustive_patterns)]
33
#![feature(type_alias_impl_trait)]
44
#![feature(non_exhaustive_omitted_patterns_lint)]
55
#![deny(unreachable_patterns)]

‎tests/ui/pattern/usefulness/match-privately-empty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(never_type)]
2-
#![feature(exhaustive_patterns)]
2+
#![feature(min_exhaustive_patterns)]
33

44
mod private {
55
pub struct Private {

‎tests/ui/pattern/usefulness/uninhabited.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// `Ty::is_inhabited_from` function.
66
#![feature(never_type)]
77
#![feature(never_type_fallback)]
8-
#![feature(exhaustive_patterns)]
8+
#![feature(min_exhaustive_patterns)]
99
#![deny(unreachable_patterns)]
1010

1111
macro_rules! assert_empty {

‎tests/ui/reachable/unreachable-loop-patterns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(never_type, never_type_fallback)]
2-
#![feature(exhaustive_patterns)]
2+
#![feature(min_exhaustive_patterns)]
33

44
#![allow(unreachable_code)]
55
#![deny(unreachable_patterns)]

‎tests/ui/rfcs/rfc-0000-never_patterns/typeck.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//[pass] check-pass
33
//[fail] check-fail
44
#![feature(never_patterns)]
5-
#![feature(exhaustive_patterns)]
5+
#![feature(min_exhaustive_patterns)]
66
#![allow(incomplete_features)]
77

88
#[derive(Copy, Clone)]
@@ -107,7 +107,7 @@ fn never_pattern_typeck_pass(void: Void) {
107107
}
108108
match (&[] as &[Void]) {
109109
[] => {}
110-
[!],
110+
[!, ..],
111111
}
112112
// Accept on a composite empty type.
113113
match None::<&(u32, Void)> {

‎tests/ui/rfcs/rfc-0000-never_patterns/unreachable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//[normal] check-pass
33
#![feature(never_patterns)]
44
#![allow(incomplete_features)]
5-
#![cfg_attr(exh_pats, feature(exhaustive_patterns))]
5+
#![cfg_attr(exh_pats, feature(min_exhaustive_patterns))]
66
#![allow(dead_code, unreachable_code)]
77
#![deny(unreachable_patterns)]
88

‎tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ pub struct IndirectUninhabitedVariants(UninhabitedVariants);
2828
struct A;
2929

3030
// This test checks that an empty match on a non-exhaustive uninhabited type through a level of
31-
// indirection from the defining crate will not compile without `#![feature(exhaustive_patterns)]`.
31+
// indirection from the defining crate will not compile without
32+
// `#![feature(min_exhaustive_patterns)]`.
3233

3334
fn cannot_empty_match_on_empty_enum_to_anything(x: IndirectUninhabitedEnum) -> A {
3435
match x {} //~ ERROR non-exhaustive patterns

‎tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedEnum` is non-empty
2-
--> $DIR/indirect_match_same_crate.rs:34:11
2+
--> $DIR/indirect_match_same_crate.rs:35:11
33
|
44
LL | match x {}
55
| ^
@@ -18,7 +18,7 @@ LL ~ }
1818
|
1919

2020
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedStruct` is non-empty
21-
--> $DIR/indirect_match_same_crate.rs:38:11
21+
--> $DIR/indirect_match_same_crate.rs:39:11
2222
|
2323
LL | match x {}
2424
| ^
@@ -37,7 +37,7 @@ LL ~ }
3737
|
3838

3939
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedTupleStruct` is non-empty
40-
--> $DIR/indirect_match_same_crate.rs:42:11
40+
--> $DIR/indirect_match_same_crate.rs:43:11
4141
|
4242
LL | match x {}
4343
| ^
@@ -56,7 +56,7 @@ LL ~ }
5656
|
5757

5858
error[E0004]: non-exhaustive patterns: type `IndirectUninhabitedVariants` is non-empty
59-
--> $DIR/indirect_match_same_crate.rs:48:11
59+
--> $DIR/indirect_match_same_crate.rs:49:11
6060
|
6161
LL | match x {}
6262
| ^

‎tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// aux-build:uninhabited.rs
22
#![deny(unreachable_patterns)]
3-
#![feature(exhaustive_patterns)]
3+
#![feature(min_exhaustive_patterns)]
44
#![feature(never_type)]
55

66
extern crate uninhabited;

‎tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// check-pass
22

33
#![deny(unreachable_patterns)]
4-
#![feature(exhaustive_patterns)]
4+
#![feature(min_exhaustive_patterns)]
55
#![feature(never_type)]
66

77
#[non_exhaustive]

‎tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// aux-build:uninhabited.rs
22
#![deny(unreachable_patterns)]
3-
#![feature(exhaustive_patterns)]
3+
#![feature(min_exhaustive_patterns)]
44
#![feature(never_type)]
55

66
extern crate uninhabited;

‎tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// check-pass
22

33
#![deny(unreachable_patterns)]
4-
#![feature(exhaustive_patterns)]
4+
#![feature(min_exhaustive_patterns)]
55
#![feature(never_type)]
66

77
#[non_exhaustive]

‎tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// aux-build:uninhabited.rs
22
// build-pass (FIXME(62277): could be check-pass?)
33
#![deny(unreachable_patterns)]
4-
#![feature(exhaustive_patterns)]
4+
#![feature(min_exhaustive_patterns)]
55

66
extern crate uninhabited;
77

‎tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![deny(unreachable_patterns)]
2-
#![feature(exhaustive_patterns)]
2+
#![feature(min_exhaustive_patterns)]
33
#![feature(never_type)]
44

55
#[non_exhaustive]

‎tests/ui/uninhabited/exhaustive-wo-nevertype-issue-51221.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// check-pass
22

3-
#![feature(exhaustive_patterns)]
3+
#![feature(min_exhaustive_patterns)]
44

55
enum Void {}
66
fn main() {

‎tests/ui/uninhabited/uninhabited-irrefutable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(never_type)]
2-
#![feature(exhaustive_patterns)]
2+
#![feature(min_exhaustive_patterns)]
33

44
mod foo {
55
pub struct SecretlyEmpty {

‎tests/ui/uninhabited/uninhabited-patterns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![feature(box_patterns)]
22
#![feature(never_type)]
3-
#![feature(exhaustive_patterns)]
3+
#![feature(min_exhaustive_patterns)]
44
#![deny(unreachable_patterns)]
55

66
mod foo {

0 commit comments

Comments
 (0)