diff options
Diffstat (limited to 'src/test/ui/rfc1445')
12 files changed, 32 insertions, 32 deletions
diff --git a/src/test/ui/rfc1445/cant-hide-behind-direct-struct-embedded.rs b/src/test/ui/rfc1445/cant-hide-behind-direct-struct-embedded.rs index e9dcb4f85f6..c663535e533 100644 --- a/src/test/ui/rfc1445/cant-hide-behind-direct-struct-embedded.rs +++ b/src/test/ui/rfc1445/cant-hide-behind-direct-struct-embedded.rs @@ -1,6 +1,6 @@ // This is part of a set of tests exploring the different ways a -// `#[structural_match]` ADT might try to hold a -// non-`#[structural_match]` in hidden manner that lets matches +// structural-match ADT might try to hold a +// non-structural-match in hidden manner that lets matches // through that we had intended to reject. // // See discussion on rust-lang/rust#62307 and rust-lang/rust#62339 diff --git a/src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.rs b/src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.rs index ab1cb3babaa..872bf5a63ff 100644 --- a/src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.rs +++ b/src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.rs @@ -1,6 +1,6 @@ // This is part of a set of tests exploring the different ways a -// `#[structural_match]` ADT might try to hold a -// non-`#[structural_match]` in hidden manner that lets matches +// structural-match ADT might try to hold a +// non-structural-match in hidden manner that lets matches // through that we had intended to reject. // // See discussion on rust-lang/rust#62307 and rust-lang/rust#62339 diff --git a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.rs b/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.rs index 0328db5a49c..f6947819695 100644 --- a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.rs +++ b/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.rs @@ -1,6 +1,6 @@ // This is part of a set of tests exploring the different ways a -// `#[structural_match]` ADT might try to hold a -// non-`#[structural_match]` in hidden manner that lets matches +// structural-match ADT might try to hold a +// non-structural-match in hidden manner that lets matches // through that we had intended to reject. // // See discussion on rust-lang/rust#62307 and rust-lang/rust#62339 diff --git a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.rs b/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.rs index 54579e487a6..1c29d67b655 100644 --- a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.rs +++ b/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.rs @@ -1,6 +1,6 @@ // This is part of a set of tests exploring the different ways a -// `#[structural_match]` ADT might try to hold a -// non-`#[structural_match]` in hidden manner that lets matches +// structural-match ADT might try to hold a +// non-structural-match in hidden manner that lets matches // through that we had intended to reject. // // See discussion on rust-lang/rust#62307 and rust-lang/rust#62339 diff --git a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.rs b/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.rs index 2a24316898b..1a41dbb55c2 100644 --- a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.rs +++ b/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.rs @@ -1,6 +1,6 @@ // This is part of a set of tests exploring the different ways a -// `#[structural_match]` ADT might try to hold a -// non-`#[structural_match]` in hidden manner that lets matches +// structural-match ADT might try to hold a +// non-structural-match in hidden manner that lets matches // through that we had intended to reject. // // See discussion on rust-lang/rust#62307 and rust-lang/rust#62339 diff --git a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.rs b/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.rs index 64e777f2322..46032c4b0eb 100644 --- a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.rs +++ b/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.rs @@ -1,6 +1,6 @@ // This is part of a set of tests exploring the different ways a -// `#[structural_match]` ADT might try to hold a -// non-`#[structural_match]` in hidden manner that lets matches +// structural-match ADT might try to hold a +// non-structural-match in hidden manner that lets matches // through that we had intended to reject. // // See discussion on rust-lang/rust#62307 and rust-lang/rust#62339 diff --git a/src/test/ui/rfc1445/feature-gate.rs b/src/test/ui/rfc1445/feature-gate.rs index 21addfab8f5..ee6674097ce 100644 --- a/src/test/ui/rfc1445/feature-gate.rs +++ b/src/test/ui/rfc1445/feature-gate.rs @@ -1,4 +1,4 @@ -// Test that structural match is only permitted with a feature gate, +// Test that use of structural-match traits is only permitted with a feature gate, // and that if a feature gate is supplied, it permits the type to be // used in a match. diff --git a/src/test/ui/rfc1445/fn-ptr-is-structurally-matchable.rs b/src/test/ui/rfc1445/fn-ptr-is-structurally-matchable.rs index 5b378fb2a59..2b3fbd2a4d2 100644 --- a/src/test/ui/rfc1445/fn-ptr-is-structurally-matchable.rs +++ b/src/test/ui/rfc1445/fn-ptr-is-structurally-matchable.rs @@ -36,7 +36,7 @@ fn main() { // a singleton type of the fn itself that the type inference would // otherwise assign. - // Check that fn() is #[structural_match] + // Check that fn() is structural-match const CFN1: Wrap<fn()> = Wrap(trivial); let input: Wrap<fn()> = Wrap(trivial); match Wrap(input) { @@ -44,7 +44,7 @@ fn main() { Wrap(_) => {} }; - // Check that fn(T) is #[structural_match] when T is too. + // Check that fn(T) is structural-match when T is too. const CFN2: Wrap<fn(SM)> = Wrap(sm_to); let input: Wrap<fn(SM)> = Wrap(sm_to); match Wrap(input) { @@ -52,7 +52,7 @@ fn main() { Wrap(_) => {} }; - // Check that fn() -> T is #[structural_match] when T is too. + // Check that fn() -> T is structural-match when T is too. const CFN3: Wrap<fn() -> SM> = Wrap(to_sm); let input: Wrap<fn() -> SM> = Wrap(to_sm); match Wrap(input) { @@ -60,7 +60,7 @@ fn main() { Wrap(_) => {} }; - // Check that fn(T) is #[structural_match] even if T is not. + // Check that fn(T) is structural-match even if T is not. const CFN4: Wrap<fn(NotSM)> = Wrap(not_sm_to); let input: Wrap<fn(NotSM)> = Wrap(not_sm_to); match Wrap(input) { @@ -68,7 +68,7 @@ fn main() { Wrap(_) => {} }; - // Check that fn() -> T is #[structural_match] even if T is not. + // Check that fn() -> T is structural-match even if T is not. const CFN5: Wrap<fn() -> NotSM> = Wrap(to_not_sm); let input: Wrap<fn() -> NotSM> = Wrap(to_not_sm); match Wrap(input) { @@ -76,7 +76,7 @@ fn main() { Wrap(_) => {} }; - // Check that fn(&T) is #[structural_match] when T is too. + // Check that fn(&T) is structural-match when T is too. const CFN6: Wrap<fn(&SM)> = Wrap(r_sm_to); let input: Wrap<fn(&SM)> = Wrap(r_sm_to); match Wrap(input) { @@ -84,7 +84,7 @@ fn main() { Wrap(_) => {} }; - // Check that fn() -> &T is #[structural_match] when T is too. + // Check that fn() -> &T is structural-match when T is too. const CFN7: Wrap<fn(&()) -> &SM> = Wrap(r_to_r_sm); let input: Wrap<fn(&()) -> &SM> = Wrap(r_to_r_sm); match Wrap(input) { @@ -92,7 +92,7 @@ fn main() { Wrap(_) => {} }; - // Check that fn(T) is #[structural_match] even if T is not. + // Check that fn(T) is structural-match even if T is not. const CFN8: Wrap<fn(&NotSM)> = Wrap(r_not_sm_to); let input: Wrap<fn(&NotSM)> = Wrap(r_not_sm_to); match Wrap(input) { @@ -100,7 +100,7 @@ fn main() { Wrap(_) => {} }; - // Check that fn() -> T is #[structural_match] even if T is not. + // Check that fn() -> T is structural-match even if T is not. const CFN9: Wrap<fn(&()) -> &NotSM> = Wrap(r_to_r_not_sm); let input: Wrap<fn(&()) -> &NotSM> = Wrap(r_to_r_not_sm); match Wrap(input) { @@ -108,7 +108,7 @@ fn main() { Wrap(_) => {} }; - // Check that a type which has fn ptrs is `#[structural_match]`. + // Check that a type which has fn ptrs is structural-match. #[derive(PartialEq, Eq)] struct Foo { alpha: fn(NotSM), diff --git a/src/test/ui/rfc1445/issue-61188-match-slice-forbidden-without-eq.rs b/src/test/ui/rfc1445/issue-61188-match-slice-forbidden-without-eq.rs index e288beca090..2a915d61e3d 100644 --- a/src/test/ui/rfc1445/issue-61188-match-slice-forbidden-without-eq.rs +++ b/src/test/ui/rfc1445/issue-61188-match-slice-forbidden-without-eq.rs @@ -1,7 +1,7 @@ // Issue 61188 pointed out a case where we hit an ICE during code gen: // the compiler assumed that `PartialEq` was always implemented on any // use of a `const` item in a pattern context, but the pre-existing -// checking for the presence of `#[structural_match]` was too shallow +// structural-match checking was too shallow // (see rust-lang/rust#62307), and so we hit cases where we were // trying to dispatch to `PartialEq` on types that did not implement // that trait. diff --git a/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.rs b/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.rs index 98943a9666a..6ebb948d736 100644 --- a/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.rs +++ b/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.rs @@ -8,8 +8,8 @@ // resolve the question of what semantics is used for such matching. // (See RFC 1445 for more details and discussion.) -// Issue 62307 pointed out a case where the checking for -// `#[structural_match]` was too shallow. +// Issue 62307 pointed out a case where the structural-match checking +// was too shallow. #![warn(indirect_structural_match)] // run-pass diff --git a/src/test/ui/rfc1445/match-nonempty-array-forbidden-without-eq.rs b/src/test/ui/rfc1445/match-nonempty-array-forbidden-without-eq.rs index 9ef8a68da80..4112e8f4517 100644 --- a/src/test/ui/rfc1445/match-nonempty-array-forbidden-without-eq.rs +++ b/src/test/ui/rfc1445/match-nonempty-array-forbidden-without-eq.rs @@ -1,5 +1,5 @@ -// Issue 62307 pointed out a case where the checking for -// `#[structural_match]` was too shallow. +// Issue 62307 pointed out a case where the structural-match checking +// was too shallow. // // Here we check similar behavior for non-empty arrays of types that // do not derive `Eq`. diff --git a/src/test/ui/rfc1445/phantom-data-is-structurally-matchable.rs b/src/test/ui/rfc1445/phantom-data-is-structurally-matchable.rs index af025b9bbbf..50f91420ce2 100644 --- a/src/test/ui/rfc1445/phantom-data-is-structurally-matchable.rs +++ b/src/test/ui/rfc1445/phantom-data-is-structurally-matchable.rs @@ -14,25 +14,25 @@ fn main() { #[derive(PartialEq, Eq)] struct SM; - // Check that SM is #[structural_match]: + // Check that SM is structural-match: const CSM: SM = SM; match SM { CSM => count += 1, }; - // Check that PhantomData<T> is #[structural_match] even if T is not. + // Check that PhantomData<T> is structural-match even if T is not. const CPD1: PhantomData<NotSM> = PhantomData; match PhantomData { CPD1 => count += 1, }; - // Check that PhantomData<T> is #[structural_match] when T is. + // Check that PhantomData<T> is structural-match when T is. const CPD2: PhantomData<SM> = PhantomData; match PhantomData { CPD2 => count += 1, }; - // Check that a type which has a PhantomData is `#[structural_match]`. + // Check that a type which has a PhantomData is structural-match. #[derive(PartialEq, Eq, Default)] struct Foo { alpha: PhantomData<NotSM>, |