From 3c6c901f6b0b8926ccb28e3e8aba26548a5842ac Mon Sep 17 00:00:00 2001 From: zedddie Date: Mon, 1 Jun 2026 06:07:03 +0200 Subject: [PATCH 1/2] move batch --- .../issue-17959.rs => dropck/drop-impl-sized-bound-mismatch.rs} | 0 .../drop-impl-sized-bound-mismatch.stderr} | 0 .../impl-generic-struct-with-concrete-types.rs} | 0 .../issue-18183.rs => generics/type-param-self-reference.rs} | 0 .../type-param-self-reference.stderr} | 0 .../issue-18107.rs => impl-trait/bare-trait-object-return.rs} | 0 .../bare-trait-object-return.stderr} | 0 .../elided-lifetime-mismatch-in-self-type.rs} | 0 .../elided-lifetime-mismatch-in-self-type.stderr} | 0 .../issue-18232.rs => lifetimes/trait-method-lifetime-bounds.rs} | 0 .../issue-17999.rs => lint/unused/unused-variables-in-loop.rs} | 0 .../unused/unused-variables-in-loop.stderr} | 0 .../issue-18446.rs => methods/call-ambig-trait-object-method.rs} | 0 .../call-ambig-trait-object-method.stderr} | 0 .../inherent-method-on-dyn-with-default.rs} | 0 .../issue-18173.rs => traits/bound/implicit-assoc-type.rs} | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename tests/ui/{issues/issue-17959.rs => dropck/drop-impl-sized-bound-mismatch.rs} (100%) rename tests/ui/{issues/issue-17959.stderr => dropck/drop-impl-sized-bound-mismatch.stderr} (100%) rename tests/ui/{issues/issue-17905.rs => generics/impl-generic-struct-with-concrete-types.rs} (100%) rename tests/ui/{issues/issue-18183.rs => generics/type-param-self-reference.rs} (100%) rename tests/ui/{issues/issue-18183.stderr => generics/type-param-self-reference.stderr} (100%) rename tests/ui/{issues/issue-18107.rs => impl-trait/bare-trait-object-return.rs} (100%) rename tests/ui/{issues/issue-18107.stderr => impl-trait/bare-trait-object-return.stderr} (100%) rename tests/ui/{issues/issue-17905-2.rs => lifetimes/elided-lifetime-mismatch-in-self-type.rs} (100%) rename tests/ui/{issues/issue-17905-2.stderr => lifetimes/elided-lifetime-mismatch-in-self-type.stderr} (100%) rename tests/ui/{issues/issue-18232.rs => lifetimes/trait-method-lifetime-bounds.rs} (100%) rename tests/ui/{issues/issue-17999.rs => lint/unused/unused-variables-in-loop.rs} (100%) rename tests/ui/{issues/issue-17999.stderr => lint/unused/unused-variables-in-loop.stderr} (100%) rename tests/ui/{issues/issue-18446.rs => methods/call-ambig-trait-object-method.rs} (100%) rename tests/ui/{issues/issue-18446.stderr => methods/call-ambig-trait-object-method.stderr} (100%) rename tests/ui/{issues/issue-18446-2.rs => methods/inherent-method-on-dyn-with-default.rs} (100%) rename tests/ui/{issues/issue-18173.rs => traits/bound/implicit-assoc-type.rs} (100%) diff --git a/tests/ui/issues/issue-17959.rs b/tests/ui/dropck/drop-impl-sized-bound-mismatch.rs similarity index 100% rename from tests/ui/issues/issue-17959.rs rename to tests/ui/dropck/drop-impl-sized-bound-mismatch.rs diff --git a/tests/ui/issues/issue-17959.stderr b/tests/ui/dropck/drop-impl-sized-bound-mismatch.stderr similarity index 100% rename from tests/ui/issues/issue-17959.stderr rename to tests/ui/dropck/drop-impl-sized-bound-mismatch.stderr diff --git a/tests/ui/issues/issue-17905.rs b/tests/ui/generics/impl-generic-struct-with-concrete-types.rs similarity index 100% rename from tests/ui/issues/issue-17905.rs rename to tests/ui/generics/impl-generic-struct-with-concrete-types.rs diff --git a/tests/ui/issues/issue-18183.rs b/tests/ui/generics/type-param-self-reference.rs similarity index 100% rename from tests/ui/issues/issue-18183.rs rename to tests/ui/generics/type-param-self-reference.rs diff --git a/tests/ui/issues/issue-18183.stderr b/tests/ui/generics/type-param-self-reference.stderr similarity index 100% rename from tests/ui/issues/issue-18183.stderr rename to tests/ui/generics/type-param-self-reference.stderr diff --git a/tests/ui/issues/issue-18107.rs b/tests/ui/impl-trait/bare-trait-object-return.rs similarity index 100% rename from tests/ui/issues/issue-18107.rs rename to tests/ui/impl-trait/bare-trait-object-return.rs diff --git a/tests/ui/issues/issue-18107.stderr b/tests/ui/impl-trait/bare-trait-object-return.stderr similarity index 100% rename from tests/ui/issues/issue-18107.stderr rename to tests/ui/impl-trait/bare-trait-object-return.stderr diff --git a/tests/ui/issues/issue-17905-2.rs b/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.rs similarity index 100% rename from tests/ui/issues/issue-17905-2.rs rename to tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.rs diff --git a/tests/ui/issues/issue-17905-2.stderr b/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.stderr similarity index 100% rename from tests/ui/issues/issue-17905-2.stderr rename to tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.stderr diff --git a/tests/ui/issues/issue-18232.rs b/tests/ui/lifetimes/trait-method-lifetime-bounds.rs similarity index 100% rename from tests/ui/issues/issue-18232.rs rename to tests/ui/lifetimes/trait-method-lifetime-bounds.rs diff --git a/tests/ui/issues/issue-17999.rs b/tests/ui/lint/unused/unused-variables-in-loop.rs similarity index 100% rename from tests/ui/issues/issue-17999.rs rename to tests/ui/lint/unused/unused-variables-in-loop.rs diff --git a/tests/ui/issues/issue-17999.stderr b/tests/ui/lint/unused/unused-variables-in-loop.stderr similarity index 100% rename from tests/ui/issues/issue-17999.stderr rename to tests/ui/lint/unused/unused-variables-in-loop.stderr diff --git a/tests/ui/issues/issue-18446.rs b/tests/ui/methods/call-ambig-trait-object-method.rs similarity index 100% rename from tests/ui/issues/issue-18446.rs rename to tests/ui/methods/call-ambig-trait-object-method.rs diff --git a/tests/ui/issues/issue-18446.stderr b/tests/ui/methods/call-ambig-trait-object-method.stderr similarity index 100% rename from tests/ui/issues/issue-18446.stderr rename to tests/ui/methods/call-ambig-trait-object-method.stderr diff --git a/tests/ui/issues/issue-18446-2.rs b/tests/ui/methods/inherent-method-on-dyn-with-default.rs similarity index 100% rename from tests/ui/issues/issue-18446-2.rs rename to tests/ui/methods/inherent-method-on-dyn-with-default.rs diff --git a/tests/ui/issues/issue-18173.rs b/tests/ui/traits/bound/implicit-assoc-type.rs similarity index 100% rename from tests/ui/issues/issue-18173.rs rename to tests/ui/traits/bound/implicit-assoc-type.rs From 01f5cc80731a968550ab858d28904948f4780fe6 Mon Sep 17 00:00:00 2001 From: zedddie Date: Mon, 1 Jun 2026 06:35:38 +0200 Subject: [PATCH 2/2] bless batch --- tests/ui/dropck/drop-impl-sized-bound-mismatch.rs | 2 ++ .../ui/dropck/drop-impl-sized-bound-mismatch.stderr | 4 ++-- .../impl-generic-struct-with-concrete-types.rs | 2 ++ tests/ui/generics/type-param-self-reference.rs | 2 ++ tests/ui/generics/type-param-self-reference.stderr | 2 +- tests/ui/impl-trait/bare-trait-object-return.rs | 2 ++ tests/ui/impl-trait/bare-trait-object-return.stderr | 2 +- .../elided-lifetime-mismatch-in-self-type.rs | 2 ++ .../elided-lifetime-mismatch-in-self-type.stderr | 12 ++++++------ tests/ui/lifetimes/trait-method-lifetime-bounds.rs | 2 ++ tests/ui/lint/unused/unused-variables-in-loop.rs | 2 ++ tests/ui/lint/unused/unused-variables-in-loop.stderr | 6 +++--- tests/ui/methods/call-ambig-trait-object-method.rs | 5 +++-- .../ui/methods/call-ambig-trait-object-method.stderr | 6 +++--- .../methods/inherent-method-on-dyn-with-default.rs | 5 ++++- tests/ui/traits/bound/implicit-assoc-type.rs | 2 ++ 16 files changed, 39 insertions(+), 19 deletions(-) diff --git a/tests/ui/dropck/drop-impl-sized-bound-mismatch.rs b/tests/ui/dropck/drop-impl-sized-bound-mismatch.rs index 8bf9e623605ca..c5a0e256d7b7f 100644 --- a/tests/ui/dropck/drop-impl-sized-bound-mismatch.rs +++ b/tests/ui/dropck/drop-impl-sized-bound-mismatch.rs @@ -1,3 +1,5 @@ +//! Regression test for . + extern crate core; use core::ops::Drop; diff --git a/tests/ui/dropck/drop-impl-sized-bound-mismatch.stderr b/tests/ui/dropck/drop-impl-sized-bound-mismatch.stderr index 604413c4b6d19..b21cc26245ed8 100644 --- a/tests/ui/dropck/drop-impl-sized-bound-mismatch.stderr +++ b/tests/ui/dropck/drop-impl-sized-bound-mismatch.stderr @@ -1,11 +1,11 @@ error[E0367]: `Drop` impl requires `T: Sized` but the struct it is implemented for does not - --> $DIR/issue-17959.rs:11:6 + --> $DIR/drop-impl-sized-bound-mismatch.rs:13:6 | LL | impl Drop for G { | ^ | note: the implementor must specify the same requirement - --> $DIR/issue-17959.rs:7:1 + --> $DIR/drop-impl-sized-bound-mismatch.rs:9:1 | LL | struct G { | ^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/generics/impl-generic-struct-with-concrete-types.rs b/tests/ui/generics/impl-generic-struct-with-concrete-types.rs index 6238379b5a04b..68a7db69a2bb1 100644 --- a/tests/ui/generics/impl-generic-struct-with-concrete-types.rs +++ b/tests/ui/generics/impl-generic-struct-with-concrete-types.rs @@ -1,3 +1,5 @@ +//! Regression test for . + //@ run-pass #[derive(Debug)] diff --git a/tests/ui/generics/type-param-self-reference.rs b/tests/ui/generics/type-param-self-reference.rs index 64476d1c10999..dd8fead948916 100644 --- a/tests/ui/generics/type-param-self-reference.rs +++ b/tests/ui/generics/type-param-self-reference.rs @@ -1,3 +1,5 @@ +//! Regression test for . + pub struct Foo(Bar); //~ ERROR E0128 pub struct Baz(Foo); fn main() {} diff --git a/tests/ui/generics/type-param-self-reference.stderr b/tests/ui/generics/type-param-self-reference.stderr index 07fa4cdc7535c..b24f0ee8b67e0 100644 --- a/tests/ui/generics/type-param-self-reference.stderr +++ b/tests/ui/generics/type-param-self-reference.stderr @@ -1,5 +1,5 @@ error[E0128]: generic parameter defaults cannot reference parameters before they are declared - --> $DIR/issue-18183.rs:1:20 + --> $DIR/type-param-self-reference.rs:3:20 | LL | pub struct Foo(Bar); | ^^^ cannot reference `Bar` before it is declared diff --git a/tests/ui/impl-trait/bare-trait-object-return.rs b/tests/ui/impl-trait/bare-trait-object-return.rs index b1b6ff4f7ad26..18cafddd6a911 100644 --- a/tests/ui/impl-trait/bare-trait-object-return.rs +++ b/tests/ui/impl-trait/bare-trait-object-return.rs @@ -1,3 +1,5 @@ +//! Regression test for . + pub trait AbstractRenderer {} fn _create_render(_: &()) -> diff --git a/tests/ui/impl-trait/bare-trait-object-return.stderr b/tests/ui/impl-trait/bare-trait-object-return.stderr index 177ef2f1c33f7..0445926e4d4a3 100644 --- a/tests/ui/impl-trait/bare-trait-object-return.stderr +++ b/tests/ui/impl-trait/bare-trait-object-return.stderr @@ -1,5 +1,5 @@ error[E0746]: return type cannot be a trait object without pointer indirection - --> $DIR/issue-18107.rs:4:5 + --> $DIR/bare-trait-object-return.rs:6:5 | LL | dyn AbstractRenderer | ^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.rs b/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.rs index 44279cc867b46..fa634c8447a79 100644 --- a/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.rs +++ b/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.rs @@ -1,3 +1,5 @@ +//! Regression test for . + #[derive(Debug)] struct Pair (T, V); diff --git a/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.stderr b/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.stderr index c66cb2224897d..920fe850f0ec7 100644 --- a/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.stderr +++ b/tests/ui/lifetimes/elided-lifetime-mismatch-in-self-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched `self` parameter type - --> $DIR/issue-17905-2.rs:8:18 + --> $DIR/elided-lifetime-mismatch-in-self-type.rs:10:18 | LL | fn say(self: &Pair<&str, isize>) { | ^^^^^^^^^^^^^^^^^^ lifetime mismatch @@ -7,18 +7,18 @@ LL | fn say(self: &Pair<&str, isize>) { = note: expected struct `Pair<&_, _>` found struct `Pair<&_, _>` note: the anonymous lifetime defined here... - --> $DIR/issue-17905-2.rs:8:24 + --> $DIR/elided-lifetime-mismatch-in-self-type.rs:10:24 | LL | fn say(self: &Pair<&str, isize>) { | ^^^^ note: ...does not necessarily outlive the anonymous lifetime as defined here - --> $DIR/issue-17905-2.rs:5:5 + --> $DIR/elided-lifetime-mismatch-in-self-type.rs:7:5 | LL | &str, | ^ error[E0308]: mismatched `self` parameter type - --> $DIR/issue-17905-2.rs:8:18 + --> $DIR/elided-lifetime-mismatch-in-self-type.rs:10:18 | LL | fn say(self: &Pair<&str, isize>) { | ^^^^^^^^^^^^^^^^^^ lifetime mismatch @@ -26,12 +26,12 @@ LL | fn say(self: &Pair<&str, isize>) { = note: expected struct `Pair<&_, _>` found struct `Pair<&_, _>` note: the anonymous lifetime as defined here... - --> $DIR/issue-17905-2.rs:5:5 + --> $DIR/elided-lifetime-mismatch-in-self-type.rs:7:5 | LL | &str, | ^ note: ...does not necessarily outlive the anonymous lifetime defined here - --> $DIR/issue-17905-2.rs:8:24 + --> $DIR/elided-lifetime-mismatch-in-self-type.rs:10:24 | LL | fn say(self: &Pair<&str, isize>) { | ^^^^ diff --git a/tests/ui/lifetimes/trait-method-lifetime-bounds.rs b/tests/ui/lifetimes/trait-method-lifetime-bounds.rs index d526a67950cf6..eebdce5b49286 100644 --- a/tests/ui/lifetimes/trait-method-lifetime-bounds.rs +++ b/tests/ui/lifetimes/trait-method-lifetime-bounds.rs @@ -1,3 +1,5 @@ +//! Regression test for . + //@ run-pass struct Cursor<'a>(::std::marker::PhantomData<&'a ()>); diff --git a/tests/ui/lint/unused/unused-variables-in-loop.rs b/tests/ui/lint/unused/unused-variables-in-loop.rs index 941f1e7755afe..c96d2ac5f3fe5 100644 --- a/tests/ui/lint/unused/unused-variables-in-loop.rs +++ b/tests/ui/lint/unused/unused-variables-in-loop.rs @@ -1,3 +1,5 @@ +//! Regression test for . + #![deny(unused_variables)] fn main() { diff --git a/tests/ui/lint/unused/unused-variables-in-loop.stderr b/tests/ui/lint/unused/unused-variables-in-loop.stderr index 4a1ef7350b8cb..6c311f03ce508 100644 --- a/tests/ui/lint/unused/unused-variables-in-loop.stderr +++ b/tests/ui/lint/unused/unused-variables-in-loop.stderr @@ -1,17 +1,17 @@ error: unused variable: `x` - --> $DIR/issue-17999.rs:5:13 + --> $DIR/unused-variables-in-loop.rs:7:13 | LL | let x = (); | ^ help: if this is intentional, prefix it with an underscore: `_x` | note: the lint level is defined here - --> $DIR/issue-17999.rs:1:9 + --> $DIR/unused-variables-in-loop.rs:3:9 | LL | #![deny(unused_variables)] | ^^^^^^^^^^^^^^^^ error: unused variable: `a` - --> $DIR/issue-17999.rs:7:13 + --> $DIR/unused-variables-in-loop.rs:9:13 | LL | a => {} | ^ help: if this is intentional, prefix it with an underscore: `_a` diff --git a/tests/ui/methods/call-ambig-trait-object-method.rs b/tests/ui/methods/call-ambig-trait-object-method.rs index a2e238da03a3e..9e2f5c5aebe8b 100644 --- a/tests/ui/methods/call-ambig-trait-object-method.rs +++ b/tests/ui/methods/call-ambig-trait-object-method.rs @@ -1,5 +1,6 @@ -// Test that name clashes between the method in an impl for the type -// and the method in the trait when both are in the same scope. +//! Regression test for . +//! Test that name clashes between the method in an impl for the type +//! and the method in the trait when both are in the same scope. trait T { fn foo(&self); diff --git a/tests/ui/methods/call-ambig-trait-object-method.stderr b/tests/ui/methods/call-ambig-trait-object-method.stderr index 25ae303e902b5..b76f107160011 100644 --- a/tests/ui/methods/call-ambig-trait-object-method.stderr +++ b/tests/ui/methods/call-ambig-trait-object-method.stderr @@ -1,16 +1,16 @@ error[E0034]: multiple applicable items in scope - --> $DIR/issue-18446.rs:18:7 + --> $DIR/call-ambig-trait-object-method.rs:19:7 | LL | x.foo(); | ^^^ multiple `foo` found | note: candidate #1 is defined in the trait `T` - --> $DIR/issue-18446.rs:5:5 + --> $DIR/call-ambig-trait-object-method.rs:6:5 | LL | fn foo(&self); | ^^^^^^^^^^^^^^ note: candidate #2 is defined in an impl for the type `(dyn T + 'a)` - --> $DIR/issue-18446.rs:9:5 + --> $DIR/call-ambig-trait-object-method.rs:10:5 | LL | fn foo(&self) {} | ^^^^^^^^^^^^^ diff --git a/tests/ui/methods/inherent-method-on-dyn-with-default.rs b/tests/ui/methods/inherent-method-on-dyn-with-default.rs index d403487c001fb..cb84da56defad 100644 --- a/tests/ui/methods/inherent-method-on-dyn-with-default.rs +++ b/tests/ui/methods/inherent-method-on-dyn-with-default.rs @@ -1,6 +1,9 @@ +//! Regression test for . +//! Tests that an inherent method on a trait object with existing default method +//! doesn't emit a duplicate definition error. + //@ check-pass #![allow(dead_code)] -// Test that methods in trait impls should override default methods. trait T { fn foo(&self) -> i32 { 0 } diff --git a/tests/ui/traits/bound/implicit-assoc-type.rs b/tests/ui/traits/bound/implicit-assoc-type.rs index a9f20e827fbe3..491516ac6bfae 100644 --- a/tests/ui/traits/bound/implicit-assoc-type.rs +++ b/tests/ui/traits/bound/implicit-assoc-type.rs @@ -1,3 +1,5 @@ +//! Regression test for . + //@ check-pass trait Foo { type T;