Skip to content

Commit

Permalink
Add unstable struct fields to ui tests
Browse files Browse the repository at this point in the history
  • Loading branch information
DevinR528 committed Mar 12, 2022
1 parent 8663ee1 commit 3344833
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 2 deletions.
31 changes: 31 additions & 0 deletions src/test/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs
Expand Up @@ -27,3 +27,34 @@ impl OnlyUnstableEnum {
Self::Unstable
}
}

#[derive(Default)]
#[stable(feature = "stable_test_feature", since = "1.0.0")]
#[non_exhaustive]
pub struct UnstableStruct {
#[stable(feature = "stable_test_feature", since = "1.0.0")]
pub stable: bool,
#[stable(feature = "stable_test_feature", since = "1.0.0")]
pub stable2: usize,
#[unstable(feature = "unstable_test_feature", issue = "none")]
pub unstable: u8,
}

#[stable(feature = "stable_test_feature", since = "1.0.0")]
#[non_exhaustive]
pub struct OnlyUnstableStruct {
#[unstable(feature = "unstable_test_feature", issue = "none")]
pub unstable: u8,
#[unstable(feature = "unstable_test_feature", issue = "none")]
pub unstable2: bool,
}

impl OnlyUnstableStruct {
#[stable(feature = "stable_test_feature", since = "1.0.0")]
pub fn new() -> Self {
Self {
unstable: 0,
unstable2: false,
}
}
}
19 changes: 18 additions & 1 deletion src/test/ui/rfc-2008-non-exhaustive/omitted-patterns.rs
Expand Up @@ -13,7 +13,7 @@ use enums::{
EmptyNonExhaustiveEnum, NestedNonExhaustive, NonExhaustiveEnum, NonExhaustiveSingleVariant,
VariantNonExhaustive,
};
use unstable::{UnstableEnum, OnlyUnstableEnum};
use unstable::{UnstableEnum, OnlyUnstableEnum, UnstableStruct, OnlyUnstableStruct};
use structs::{FunctionalRecord, MixedVisFields, NestedStruct, NormalStruct};

#[non_exhaustive]
Expand Down Expand Up @@ -145,6 +145,7 @@ fn main() {
}
//~^^ some variants are not matched explicitly

// Ok: the feature is on and all variants are matched
#[deny(non_exhaustive_omitted_patterns)]
match UnstableEnum::Stable {
UnstableEnum::Stable => {}
Expand All @@ -167,4 +168,20 @@ fn main() {
_ => {}
}
//~^^ some variants are not matched explicitly

#[warn(non_exhaustive_omitted_patterns)]
let OnlyUnstableStruct { unstable, .. } = OnlyUnstableStruct::new();
//~^ some fields are not explicitly listed

// OK: both unstable fields are matched with feature on
#[warn(non_exhaustive_omitted_patterns)]
let OnlyUnstableStruct { unstable, unstable2, .. } = OnlyUnstableStruct::new();

#[warn(non_exhaustive_omitted_patterns)]
let UnstableStruct { stable, stable2, .. } = UnstableStruct::default();
//~^ some fields are not explicitly listed

// OK: both unstable and stable fields are matched with feature on
#[warn(non_exhaustive_omitted_patterns)]
let UnstableStruct { stable, stable2, unstable, .. } = UnstableStruct::default();
}
14 changes: 13 additions & 1 deletion src/test/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.rs
Expand Up @@ -6,7 +6,7 @@
// aux-build:unstable.rs
extern crate unstable;

use unstable::{UnstableEnum, OnlyUnstableEnum};
use unstable::{UnstableEnum, OnlyUnstableEnum, UnstableStruct, OnlyUnstableStruct};

fn main() {
// OK: this matches all the stable variants
Expand All @@ -30,4 +30,16 @@ fn main() {
match OnlyUnstableEnum::new() {
_ => {}
}

// Ok: Same as the above enum (no fields can be matched on)
#[warn(non_exhaustive_omitted_patterns)]
let OnlyUnstableStruct { .. } = OnlyUnstableStruct::new();

#[warn(non_exhaustive_omitted_patterns)]
let UnstableStruct { stable, .. } = UnstableStruct::default();
//~^ some fields are not explicitly listed

// OK: stable field is matched
#[warn(non_exhaustive_omitted_patterns)]
let UnstableStruct { stable, stable2, .. } = UnstableStruct::default();
}

0 comments on commit 3344833

Please sign in to comment.