From 9788aa0cefab1914b3df257c529a0089e01f2e5c Mon Sep 17 00:00:00 2001 From: lcnr Date: Mon, 20 Jan 2025 16:39:13 +0100 Subject: [PATCH 1/5] remove redundant test --- tests/ui/traits/sized-coniductive.rs | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 tests/ui/traits/sized-coniductive.rs diff --git a/tests/ui/traits/sized-coniductive.rs b/tests/ui/traits/sized-coniductive.rs deleted file mode 100644 index 5f63b166f988b..0000000000000 --- a/tests/ui/traits/sized-coniductive.rs +++ /dev/null @@ -1,14 +0,0 @@ -//@ check-pass -// https://github.com/rust-lang/rust/issues/129541 - -#[derive(Clone)] -struct Test { - field: std::borrow::Cow<'static, [Self]>, -} - -#[derive(Clone)] -struct Hello { - a: <[Hello] as std::borrow::ToOwned>::Owned, -} - -fn main(){} From 12f86ee7f32efe58eab175a4fe89b30b2068fa3e Mon Sep 17 00:00:00 2001 From: lcnr Date: Mon, 20 Jan 2025 16:42:03 +0100 Subject: [PATCH 2/5] move non_lifetime_binder tests --- .../type-alias-impl-trait/non-lifetime-binder-in-constraint.rs | 0 .../non-lifetime-binder-in-constraint.stderr | 0 .../type-alias-impl-trait/non-lifetime-binder.rs | 0 .../type-alias-impl-trait/non-lifetime-binder.stderr | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename tests/ui/{ => traits/non_lifetime_binders}/type-alias-impl-trait/non-lifetime-binder-in-constraint.rs (100%) rename tests/ui/{ => traits/non_lifetime_binders}/type-alias-impl-trait/non-lifetime-binder-in-constraint.stderr (100%) rename tests/ui/{ => traits/non_lifetime_binders}/type-alias-impl-trait/non-lifetime-binder.rs (100%) rename tests/ui/{ => traits/non_lifetime_binders}/type-alias-impl-trait/non-lifetime-binder.stderr (100%) diff --git a/tests/ui/type-alias-impl-trait/non-lifetime-binder-in-constraint.rs b/tests/ui/traits/non_lifetime_binders/type-alias-impl-trait/non-lifetime-binder-in-constraint.rs similarity index 100% rename from tests/ui/type-alias-impl-trait/non-lifetime-binder-in-constraint.rs rename to tests/ui/traits/non_lifetime_binders/type-alias-impl-trait/non-lifetime-binder-in-constraint.rs diff --git a/tests/ui/type-alias-impl-trait/non-lifetime-binder-in-constraint.stderr b/tests/ui/traits/non_lifetime_binders/type-alias-impl-trait/non-lifetime-binder-in-constraint.stderr similarity index 100% rename from tests/ui/type-alias-impl-trait/non-lifetime-binder-in-constraint.stderr rename to tests/ui/traits/non_lifetime_binders/type-alias-impl-trait/non-lifetime-binder-in-constraint.stderr diff --git a/tests/ui/type-alias-impl-trait/non-lifetime-binder.rs b/tests/ui/traits/non_lifetime_binders/type-alias-impl-trait/non-lifetime-binder.rs similarity index 100% rename from tests/ui/type-alias-impl-trait/non-lifetime-binder.rs rename to tests/ui/traits/non_lifetime_binders/type-alias-impl-trait/non-lifetime-binder.rs diff --git a/tests/ui/type-alias-impl-trait/non-lifetime-binder.stderr b/tests/ui/traits/non_lifetime_binders/type-alias-impl-trait/non-lifetime-binder.stderr similarity index 100% rename from tests/ui/type-alias-impl-trait/non-lifetime-binder.stderr rename to tests/ui/traits/non_lifetime_binders/type-alias-impl-trait/non-lifetime-binder.stderr From fef480f4b890ae50dc818036fc0900238e5339b2 Mon Sep 17 00:00:00 2001 From: lcnr Date: Mon, 20 Jan 2025 16:42:30 +0100 Subject: [PATCH 3/5] error pattern to correct line --- tests/ui/generic-associated-types/issue-90014-tait2.rs | 3 +-- tests/ui/generic-associated-types/issue-90014-tait2.stderr | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/ui/generic-associated-types/issue-90014-tait2.rs b/tests/ui/generic-associated-types/issue-90014-tait2.rs index ef54a89aaae58..3f7a9ff63c312 100644 --- a/tests/ui/generic-associated-types/issue-90014-tait2.rs +++ b/tests/ui/generic-associated-types/issue-90014-tait2.rs @@ -3,8 +3,6 @@ //! Unfortunately we don't even reach opaque type collection, as we ICE in typeck before that. //! See #109281 for the original report. //@ edition:2018 -//@ error-pattern: expected generic lifetime parameter, found `'a` - #![feature(type_alias_impl_trait)] use std::future::Future; @@ -24,6 +22,7 @@ impl<'x, T: 'x> Trait<'x> for (T,) { impl Foo<'_> { fn make_fut(&self) -> Box Trait<'a, Thing = Fut<'a>>> { Box::new((async { () },)) + //~^ ERROR expected generic lifetime parameter, found `'a` } } diff --git a/tests/ui/generic-associated-types/issue-90014-tait2.stderr b/tests/ui/generic-associated-types/issue-90014-tait2.stderr index be6f4272ce18c..aa427d42649ae 100644 --- a/tests/ui/generic-associated-types/issue-90014-tait2.stderr +++ b/tests/ui/generic-associated-types/issue-90014-tait2.stderr @@ -1,5 +1,5 @@ error[E0792]: expected generic lifetime parameter, found `'a` - --> $DIR/issue-90014-tait2.rs:26:9 + --> $DIR/issue-90014-tait2.rs:24:9 | LL | type Fut<'a> = impl Future; | -- this generic parameter must be used with a generic lifetime parameter From 8c078fde36b8b7d6757ff2bea271ecb2a85cf2eb Mon Sep 17 00:00:00 2001 From: lcnr Date: Mon, 20 Jan 2025 16:42:50 +0100 Subject: [PATCH 4/5] merge tests --- .../129541-recursive-struct-and-array-impl.rs | 23 ------------------- .../solver-cycles/129541-recursive-struct.rs | 5 ++++ 2 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 tests/ui/traits/solver-cycles/129541-recursive-struct-and-array-impl.rs diff --git a/tests/ui/traits/solver-cycles/129541-recursive-struct-and-array-impl.rs b/tests/ui/traits/solver-cycles/129541-recursive-struct-and-array-impl.rs deleted file mode 100644 index defb39aae06d4..0000000000000 --- a/tests/ui/traits/solver-cycles/129541-recursive-struct-and-array-impl.rs +++ /dev/null @@ -1,23 +0,0 @@ -// Regression test for #129541 - -//@ check-pass - -trait Bound {} -trait Normalize { - type Assoc; -} - -impl Normalize for T { - type Assoc = T; -} - -impl Normalize for [T] { - type Assoc = T; -} - -impl Bound for Hello {} -struct Hello { - a: <[Hello] as Normalize>::Assoc, -} - -fn main() {} diff --git a/tests/ui/traits/solver-cycles/129541-recursive-struct.rs b/tests/ui/traits/solver-cycles/129541-recursive-struct.rs index d4339dd54d6c7..4fbcbefec913b 100644 --- a/tests/ui/traits/solver-cycles/129541-recursive-struct.rs +++ b/tests/ui/traits/solver-cycles/129541-recursive-struct.rs @@ -1,5 +1,6 @@ // Regression test for #129541 +//@ revisions: unique multiple //@ check-pass trait Bound {} @@ -7,6 +8,10 @@ trait Normalize { type Assoc; } +#[cfg(multiple)] +impl Normalize for T { + type Assoc = T; +} impl Normalize for [T] { type Assoc = T; } From fa6b95fc4e2e0f36d52cea164544651049038074 Mon Sep 17 00:00:00 2001 From: lcnr Date: Mon, 20 Jan 2025 16:42:58 +0100 Subject: [PATCH 5/5] update comment --- tests/ui/wf/wf-trait-default-fn-ret.rs | 3 +-- tests/ui/wf/wf-trait-default-fn-ret.stderr | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/ui/wf/wf-trait-default-fn-ret.rs b/tests/ui/wf/wf-trait-default-fn-ret.rs index 2103dae8d233a..a7f83dcf678aa 100644 --- a/tests/ui/wf/wf-trait-default-fn-ret.rs +++ b/tests/ui/wf/wf-trait-default-fn-ret.rs @@ -1,5 +1,4 @@ -// Check that we test WF conditions for fn arguments. Because the -// current code is so goofy, this is only a warning for now. +// Check that we test WF conditions for fn arguments. #![feature(rustc_attrs)] #![allow(dead_code)] diff --git a/tests/ui/wf/wf-trait-default-fn-ret.stderr b/tests/ui/wf/wf-trait-default-fn-ret.stderr index f749ac7b1b3e6..f0d1b55edc49a 100644 --- a/tests/ui/wf/wf-trait-default-fn-ret.stderr +++ b/tests/ui/wf/wf-trait-default-fn-ret.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `Self: Eq` is not satisfied - --> $DIR/wf-trait-default-fn-ret.rs:11:22 + --> $DIR/wf-trait-default-fn-ret.rs:10:22 | LL | fn bar(&self) -> Bar { | ^^^^^^^^^ the trait `Eq` is not implemented for `Self` | note: required by a bound in `Bar` - --> $DIR/wf-trait-default-fn-ret.rs:8:14 + --> $DIR/wf-trait-default-fn-ret.rs:7:14 | LL | struct Bar { value: Box } | ^^ required by this bound in `Bar`