diff options
| author | Dylan MacKenzie <ecstaticmorse@gmail.com> | 2020-04-28 14:49:35 -0700 |
|---|---|---|
| committer | Dylan MacKenzie <ecstaticmorse@gmail.com> | 2020-04-28 14:58:50 -0700 |
| commit | 900cf82d4d7779d1393529e38ff3e3e28b351a37 (patch) | |
| tree | 0910a988b48a6269974c62dd683ba96c9c32305c | |
| parent | 532ba46402855517c431ab98b395f788f668deed (diff) | |
| download | rust-900cf82d4d7779d1393529e38ff3e3e28b351a37.tar.gz rust-900cf82d4d7779d1393529e38ff3e3e28b351a37.zip | |
TYPE -> TYPE_ASCRIPTIONG
3 files changed, 8 insertions, 8 deletions
diff --git a/src/test/ui/consts/const_in_pattern/accept_structural.rs b/src/test/ui/consts/const_in_pattern/accept_structural.rs index 70ec95faf6a..5093fe53915 100644 --- a/src/test/ui/consts/const_in_pattern/accept_structural.rs +++ b/src/test/ui/consts/const_in_pattern/accept_structural.rs @@ -45,8 +45,8 @@ fn main() { const TUPLE: (OND, OND) = (None, None); match (None, None) { TUPLE => dbg!(TUPLE), _ => panic!("whoops"), }; - const TYPE: OND = None: OND; - match None { TYPE => dbg!(TYPE), _ => panic!("whoops"), }; + const TYPE_ASCRIPTION: OND = None: OND; + match None { TYPE_ASCRIPTION => dbg!(TYPE_ASCRIPTION), _ => panic!("whoops"), }; const ARRAY: [OND; 2] = [None, None]; match [None; 2] { ARRAY => dbg!(ARRAY), _ => panic!("whoops"), }; diff --git a/src/test/ui/consts/const_in_pattern/reject_non_structural.rs b/src/test/ui/consts/const_in_pattern/reject_non_structural.rs index c39163ee278..bbeaeea1f87 100644 --- a/src/test/ui/consts/const_in_pattern/reject_non_structural.rs +++ b/src/test/ui/consts/const_in_pattern/reject_non_structural.rs @@ -57,8 +57,8 @@ fn main() { //~^ ERROR must be annotated with `#[derive(PartialEq, Eq)]` //~| ERROR must be annotated with `#[derive(PartialEq, Eq)]` - const TYPE: OND = Some(NoDerive): OND; - match Some(NoDerive) { TYPE => dbg!(TYPE), _ => panic!("whoops"), }; + const TYPE_ASCRIPTION: OND = Some(NoDerive): OND; + match Some(NoDerive) { TYPE_ASCRIPTION => dbg!(TYPE_ASCRIPTION), _ => panic!("whoops"), }; //~^ ERROR must be annotated with `#[derive(PartialEq, Eq)]` //~| ERROR must be annotated with `#[derive(PartialEq, Eq)]` diff --git a/src/test/ui/consts/const_in_pattern/reject_non_structural.stderr b/src/test/ui/consts/const_in_pattern/reject_non_structural.stderr index 8ea28e259ab..b1310cf101e 100644 --- a/src/test/ui/consts/const_in_pattern/reject_non_structural.stderr +++ b/src/test/ui/consts/const_in_pattern/reject_non_structural.stderr @@ -25,8 +25,8 @@ LL | match (None, Some(NoDerive)) { TUPLE => dbg!(TUPLE), _ => panic!("whoop error: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be annotated with `#[derive(PartialEq, Eq)]` --> $DIR/reject_non_structural.rs:61:28 | -LL | match Some(NoDerive) { TYPE => dbg!(TYPE), _ => panic!("whoops"), }; - | ^^^^ +LL | match Some(NoDerive) { TYPE_ASCRIPTION => dbg!(TYPE_ASCRIPTION), _ => panic!("whoops"), }; + | ^^^^^^^^^^^^^^^ error: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be annotated with `#[derive(PartialEq, Eq)]` --> $DIR/reject_non_structural.rs:66:36 @@ -99,8 +99,8 @@ LL | match (None, Some(NoDerive)) { TUPLE => dbg!(TUPLE), _ => panic!("whoop error: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be annotated with `#[derive(PartialEq, Eq)]` --> $DIR/reject_non_structural.rs:61:28 | -LL | match Some(NoDerive) { TYPE => dbg!(TYPE), _ => panic!("whoops"), }; - | ^^^^ +LL | match Some(NoDerive) { TYPE_ASCRIPTION => dbg!(TYPE_ASCRIPTION), _ => panic!("whoops"), }; + | ^^^^^^^^^^^^^^^ error: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be annotated with `#[derive(PartialEq, Eq)]` --> $DIR/reject_non_structural.rs:66:36 |