Skip to content

Commit fe4e32a

Browse files
authored
Rollup merge of rust-lang#62623 - pnkfelix:issue-62614-downgrade-indirect-structural-match-lint-to-allow, r=zackmdavis
downgrade indirect_structural_match lint to allow This is a short-term band-aid for the regression aspect of rust-lang#62614.
2 parents b1d6163 + 44d27ba commit fe4e32a

15 files changed

+99
-14
lines changed

src/librustc/lint/builtin.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,8 @@ declare_lint! {
350350

351351
declare_lint! {
352352
pub INDIRECT_STRUCTURAL_MATCH,
353-
Warn,
353+
// defaulting to allow until rust-lang/rust#62614 is fixed.
354+
Allow,
354355
"pattern with const indirectly referencing non-`#[structural_match]` type"
355356
}
356357

@@ -451,6 +452,7 @@ declare_lint_pass! {
451452
AMBIGUOUS_ASSOCIATED_ITEMS,
452453
NESTED_IMPL_TRAIT,
453454
MUTABLE_BORROW_RESERVATION_CONFLICT,
455+
INDIRECT_STRUCTURAL_MATCH,
454456
]
455457
}
456458

src/test/ui/issues/issue-55511.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
#![warn(indirect_structural_match)]
12
use std::cell::Cell;
2-
33
trait Foo<'a> {
44
const C: Option<Cell<&'a u32>>;
55
}

src/test/ui/issues/issue-55511.stderr

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ warning: to use a constant of type `std::cell::Cell` in a pattern, `std::cell::C
44
LL | <() as Foo<'static>>::C => { }
55
| ^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: #[warn(indirect_structural_match)] on by default
7+
note: lint level defined here
8+
--> $DIR/issue-55511.rs:1:9
9+
|
10+
LL | #![warn(indirect_structural_match)]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
812
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
913
= note: for more information, see issue #62411 <https://github.com/rust-lang/rust/issues/62411>
1014

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// rust-lang/rust#62614: we want to allow matching on constants of types that
2+
// have non-structural-match variants, *if* the constant itself does not use
3+
// any such variant.
4+
5+
// NOTE: for now, deliberately leaving the lint `indirect_structural_match` set
6+
// to its default, so that we will not issue a diangostic even if
7+
// rust-lang/rust#62614 remains an open issue.
8+
9+
// run-pass
10+
11+
struct Sum(u32, u32);
12+
13+
impl PartialEq for Sum {
14+
fn eq(&self, other: &Self) -> bool { self.0 + self.1 == other.0 + other.1 }
15+
}
16+
17+
impl Eq for Sum { }
18+
19+
#[derive(PartialEq, Eq)]
20+
enum Eek {
21+
TheConst,
22+
UnusedByTheConst(Sum)
23+
}
24+
25+
const THE_CONST: Eek = Eek::TheConst;
26+
const SUM_THREE: Eek = Eek::UnusedByTheConst(Sum(3,0));
27+
28+
const EEK_ZERO: &[Eek] = &[];
29+
const EEK_ONE: &[Eek] = &[THE_CONST];
30+
31+
pub fn main() {
32+
match Eek::UnusedByTheConst(Sum(1,2)) {
33+
ref sum if sum == &SUM_THREE => { println!("Hello 0"); }
34+
_ => { println!("Gbye"); }
35+
}
36+
37+
match Eek::TheConst {
38+
THE_CONST => { println!("Hello 1"); }
39+
_ => { println!("Gbye"); }
40+
}
41+
42+
43+
match & &Eek::TheConst {
44+
& & THE_CONST => { println!("Hello 2"); }
45+
_ => { println!("Gbye"); }
46+
}
47+
48+
match & & &[][..] {
49+
& & EEK_ZERO => { println!("Hello 3"); }
50+
& & EEK_ONE => { println!("Gbye"); }
51+
_ => { println!("Gbye"); }
52+
}
53+
54+
match & & &[Eek::TheConst][..] {
55+
& & EEK_ZERO => { println!("Gby"); }
56+
& & EEK_ONE => { println!("Hello 4"); }
57+
_ => { println!("Gbye"); }
58+
}
59+
}

src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// through that we had intended to reject.
55
//
66
// See discussion on rust-lang/rust#62307 and rust-lang/rust#62339
7-
7+
#![warn(indirect_structural_match)]
88
struct NoDerive(i32);
99

1010
// This impl makes NoDerive irreflexive.

src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// through that we had intended to reject.
55
//
66
// See discussion on rust-lang/rust#62307 and rust-lang/rust#62339
7-
7+
#![warn(indirect_structural_match)]
88
// run-pass
99

1010
struct NoDerive(i32);

src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.stderr

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ warning: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be a
44
LL | WRAP_DOUBLY_INDIRECT_INLINE => { panic!("WRAP_DOUBLY_INDIRECT_INLINE matched itself"); }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: #[warn(indirect_structural_match)] on by default
7+
note: lint level defined here
8+
--> $DIR/cant-hide-behind-doubly-indirect-embedded.rs:7:9
9+
|
10+
LL | #![warn(indirect_structural_match)]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
812
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
913
= note: for more information, see issue #62411 <https://github.com/rust-lang/rust/issues/62411>
1014

src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// through that we had intended to reject.
55
//
66
// See discussion on rust-lang/rust#62307 and rust-lang/rust#62339
7-
7+
#![warn(indirect_structural_match)]
88
// run-pass
99

1010
struct NoDerive(i32);

src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.stderr

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ warning: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be a
44
LL | WRAP_DOUBLY_INDIRECT_PARAM => { panic!("WRAP_DOUBLY_INDIRECT_PARAM matched itself"); }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: #[warn(indirect_structural_match)] on by default
7+
note: lint level defined here
8+
--> $DIR/cant-hide-behind-doubly-indirect-param.rs:7:9
9+
|
10+
LL | #![warn(indirect_structural_match)]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
812
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
913
= note: for more information, see issue #62411 <https://github.com/rust-lang/rust/issues/62411>
1014

src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// through that we had intended to reject.
55
//
66
// See discussion on rust-lang/rust#62307 and rust-lang/rust#62339
7-
7+
#![warn(indirect_structural_match)]
88
// run-pass
99

1010
struct NoDerive(i32);

src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.stderr

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ warning: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be a
44
LL | WRAP_INDIRECT_INLINE => { panic!("WRAP_INDIRECT_INLINE matched itself"); }
55
| ^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: #[warn(indirect_structural_match)] on by default
7+
note: lint level defined here
8+
--> $DIR/cant-hide-behind-indirect-struct-embedded.rs:7:9
9+
|
10+
LL | #![warn(indirect_structural_match)]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
812
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
913
= note: for more information, see issue #62411 <https://github.com/rust-lang/rust/issues/62411>
1014

src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// through that we had intended to reject.
55
//
66
// See discussion on rust-lang/rust#62307 and rust-lang/rust#62339
7-
7+
#![warn(indirect_structural_match)]
88
// run-pass
99

1010
struct NoDerive(i32);

src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.stderr

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ warning: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be a
44
LL | WRAP_INDIRECT_PARAM => { panic!("WRAP_INDIRECT_PARAM matched itself"); }
55
| ^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: #[warn(indirect_structural_match)] on by default
7+
note: lint level defined here
8+
--> $DIR/cant-hide-behind-indirect-struct-param.rs:7:9
9+
|
10+
LL | #![warn(indirect_structural_match)]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
812
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
913
= note: for more information, see issue #62411 <https://github.com/rust-lang/rust/issues/62411>
1014

src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// Issue 62307 pointed out a case where the checking for
1212
// `#[structural_match]` was too shallow.
13-
13+
#![warn(indirect_structural_match)]
1414
// run-pass
1515

1616
#[derive(Debug)]

src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.stderr

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ warning: to use a constant of type `B` in a pattern, `B` must be annotated with
44
LL | RR_B1 => { println!("CLAIM RR0: {:?} matches {:?}", RR_B1, RR_B0); }
55
| ^^^^^
66
|
7-
= note: #[warn(indirect_structural_match)] on by default
7+
note: lint level defined here
8+
--> $DIR/issue-62307-match-ref-ref-forbidden-without-eq.rs:13:9
9+
|
10+
LL | #![warn(indirect_structural_match)]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
812
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
913
= note: for more information, see issue #62411 <https://github.com/rust-lang/rust/issues/62411>
1014

0 commit comments

Comments
 (0)