diff --git a/tests/ui/issues/issue-56806.rs b/tests/ui/abi/invalid-self-parameter-type-56806.rs similarity index 72% rename from tests/ui/issues/issue-56806.rs rename to tests/ui/abi/invalid-self-parameter-type-56806.rs index b1dac26d65a15..60229df300577 100644 --- a/tests/ui/issues/issue-56806.rs +++ b/tests/ui/abi/invalid-self-parameter-type-56806.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/56806 pub trait Trait { fn dyn_instead_of_self(self: Box); //~^ ERROR invalid `self` parameter type diff --git a/tests/ui/issues/issue-56806.stderr b/tests/ui/abi/invalid-self-parameter-type-56806.stderr similarity index 91% rename from tests/ui/issues/issue-56806.stderr rename to tests/ui/abi/invalid-self-parameter-type-56806.stderr index ec50d863758db..ac249b8f10880 100644 --- a/tests/ui/issues/issue-56806.stderr +++ b/tests/ui/abi/invalid-self-parameter-type-56806.stderr @@ -1,5 +1,5 @@ error[E0307]: invalid `self` parameter type: `Box<(dyn Trait + 'static)>` - --> $DIR/issue-56806.rs:2:34 + --> $DIR/invalid-self-parameter-type-56806.rs:3:34 | LL | fn dyn_instead_of_self(self: Box); | ^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-68951.rs b/tests/ui/array-slice-vec/array-iteration-bitwise-operations-68951.rs similarity index 74% rename from tests/ui/issues/issue-68951.rs rename to tests/ui/array-slice-vec/array-iteration-bitwise-operations-68951.rs index 2d639a62d45ac..4904af3e1f3b0 100644 --- a/tests/ui/issues/issue-68951.rs +++ b/tests/ui/array-slice-vec/array-iteration-bitwise-operations-68951.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/68951 //@ check-pass fn main() { diff --git a/tests/ui/issues/issue-7784.rs b/tests/ui/array-slice-vec/fixed-length-vector-pattern-matching-7784.rs similarity index 93% rename from tests/ui/issues/issue-7784.rs rename to tests/ui/array-slice-vec/fixed-length-vector-pattern-matching-7784.rs index 90b88ae572764..7d987e92b63aa 100644 --- a/tests/ui/issues/issue-7784.rs +++ b/tests/ui/array-slice-vec/fixed-length-vector-pattern-matching-7784.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7784 //@ run-pass use std::ops::Add; diff --git a/tests/ui/issues/issue-68010-large-zst-consts.rs b/tests/ui/array-slice-vec/large-zst-array-compilation-time-68010-.rs similarity index 59% rename from tests/ui/issues/issue-68010-large-zst-consts.rs rename to tests/ui/array-slice-vec/large-zst-array-compilation-time-68010-.rs index 167c92f004e1d..acb6ac167c032 100644 --- a/tests/ui/issues/issue-68010-large-zst-consts.rs +++ b/tests/ui/array-slice-vec/large-zst-array-compilation-time-68010-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/68010- //@ build-pass fn main() { diff --git a/tests/ui/issues/issue-54462-mutable-noalias-correctness.rs b/tests/ui/array-slice-vec/matrix-row-swap-54462-.rs similarity index 93% rename from tests/ui/issues/issue-54462-mutable-noalias-correctness.rs rename to tests/ui/array-slice-vec/matrix-row-swap-54462-.rs index 70d0bee733262..8d0bc28ce12f1 100644 --- a/tests/ui/issues/issue-54462-mutable-noalias-correctness.rs +++ b/tests/ui/array-slice-vec/matrix-row-swap-54462-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/54462- //@ run-pass // //@ compile-flags: -Ccodegen-units=1 -O diff --git a/tests/ui/issues/issue-7012.rs b/tests/ui/array-slice-vec/static-array-comparison-7012.rs similarity index 92% rename from tests/ui/issues/issue-7012.rs rename to tests/ui/array-slice-vec/static-array-comparison-7012.rs index 69b881e2a43b3..c08b1c0059b57 100644 --- a/tests/ui/issues/issue-7012.rs +++ b/tests/ui/array-slice-vec/static-array-comparison-7012.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7012 //@ run-pass #![allow(non_camel_case_types)] #![allow(non_upper_case_globals)] diff --git a/tests/ui/issues/issue-8498.rs b/tests/ui/array-slice-vec/vector-slice-matching-8498.rs similarity index 91% rename from tests/ui/issues/issue-8498.rs rename to tests/ui/array-slice-vec/vector-slice-matching-8498.rs index 92904e2198f68..e243a247ed518 100644 --- a/tests/ui/issues/issue-8498.rs +++ b/tests/ui/array-slice-vec/vector-slice-matching-8498.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8498 //@ run-pass pub fn main() { diff --git a/tests/ui/issues/issue-56870.rs b/tests/ui/associated-consts/traits-associated-consts-ice-56870.rs similarity index 93% rename from tests/ui/issues/issue-56870.rs rename to tests/ui/associated-consts/traits-associated-consts-ice-56870.rs index fc6deedd029f1..0c5a2b8477309 100644 --- a/tests/ui/issues/issue-56870.rs +++ b/tests/ui/associated-consts/traits-associated-consts-ice-56870.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/56870 //@ build-pass // Regression test for #56870: Internal compiler error (traits & associated consts) diff --git a/tests/ui/issues/issue-78622.rs b/tests/ui/associated-types/ambiguous-associated-type-error-78622.rs similarity index 67% rename from tests/ui/issues/issue-78622.rs rename to tests/ui/associated-types/ambiguous-associated-type-error-78622.rs index c00fd26606367..9763be1ecb219 100644 --- a/tests/ui/issues/issue-78622.rs +++ b/tests/ui/associated-types/ambiguous-associated-type-error-78622.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/78622 #![crate_type = "lib"] struct S; diff --git a/tests/ui/issues/issue-78622.stderr b/tests/ui/associated-types/ambiguous-associated-type-error-78622.stderr similarity index 87% rename from tests/ui/issues/issue-78622.stderr rename to tests/ui/associated-types/ambiguous-associated-type-error-78622.stderr index 432913a0fc9c1..4dff1364af777 100644 --- a/tests/ui/issues/issue-78622.stderr +++ b/tests/ui/associated-types/ambiguous-associated-type-error-78622.stderr @@ -1,5 +1,5 @@ error[E0223]: ambiguous associated type - --> $DIR/issue-78622.rs:5:5 + --> $DIR/ambiguous-associated-type-error-78622.rs:6:5 | LL | S::A:: {} | ^^^^ diff --git a/tests/ui/issues/issue-54094.rs b/tests/ui/associated-types/associated-type-bounds-cast-54094.rs similarity index 76% rename from tests/ui/issues/issue-54094.rs rename to tests/ui/associated-types/associated-type-bounds-cast-54094.rs index 4ca7d1d81b621..c9f307e95b9a0 100644 --- a/tests/ui/issues/issue-54094.rs +++ b/tests/ui/associated-types/associated-type-bounds-cast-54094.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/54094 //@ check-pass trait Zoo { type X; diff --git a/tests/ui/issues/issue-59326.rs b/tests/ui/associated-types/duplicate-associated-type-resolution-59326.rs similarity index 89% rename from tests/ui/issues/issue-59326.rs rename to tests/ui/associated-types/duplicate-associated-type-resolution-59326.rs index e9634ad9fd8fe..0439e229e1493 100644 --- a/tests/ui/issues/issue-59326.rs +++ b/tests/ui/associated-types/duplicate-associated-type-resolution-59326.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/59326 //@ check-pass trait Service { type S; diff --git a/tests/ui/issues/issue-57399-self-return-impl-trait.rs b/tests/ui/associated-types/impl-trait-member-type-resolution-57399-.rs similarity index 80% rename from tests/ui/issues/issue-57399-self-return-impl-trait.rs rename to tests/ui/associated-types/impl-trait-member-type-resolution-57399-.rs index bcf1b18a9ff43..7c5a3319f2b8e 100644 --- a/tests/ui/issues/issue-57399-self-return-impl-trait.rs +++ b/tests/ui/associated-types/impl-trait-member-type-resolution-57399-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57399- //@ check-pass trait T { @@ -12,7 +13,6 @@ struct S { a: A, } - impl From for S<::T> { fn from(a: u32) -> Self { Self { a } diff --git a/tests/ui/issues/issue-87490.rs b/tests/ui/associated-types/mismatched-types-in-associated-type-87490.rs similarity index 80% rename from tests/ui/issues/issue-87490.rs rename to tests/ui/associated-types/mismatched-types-in-associated-type-87490.rs index 998f61a6bd32d..67e16ec6ce3ab 100644 --- a/tests/ui/issues/issue-87490.rs +++ b/tests/ui/associated-types/mismatched-types-in-associated-type-87490.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/87490 fn main() {} trait StreamOnce { type Position; diff --git a/tests/ui/issues/issue-87490.stderr b/tests/ui/associated-types/mismatched-types-in-associated-type-87490.stderr similarity index 88% rename from tests/ui/issues/issue-87490.stderr rename to tests/ui/associated-types/mismatched-types-in-associated-type-87490.stderr index 5a4ec55833bea..0a2dbcdc27b75 100644 --- a/tests/ui/issues/issue-87490.stderr +++ b/tests/ui/associated-types/mismatched-types-in-associated-type-87490.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-87490.rs:9:5 + --> $DIR/mismatched-types-in-associated-type-87490.rs:10:5 | LL | fn follow(_: &str) -> <&str as StreamOnce>::Position { | ------------------------------ expected `usize` because of return type diff --git a/tests/ui/issues/issue-65230.rs b/tests/ui/associated-types/mismatched-types-in-trait-impl-65230.rs similarity index 75% rename from tests/ui/issues/issue-65230.rs rename to tests/ui/associated-types/mismatched-types-in-trait-impl-65230.rs index 54141d2214cd9..e762f5a748549 100644 --- a/tests/ui/issues/issue-65230.rs +++ b/tests/ui/associated-types/mismatched-types-in-trait-impl-65230.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/65230 trait T0 {} trait T1: T0 {} diff --git a/tests/ui/issues/issue-65230.stderr b/tests/ui/associated-types/mismatched-types-in-trait-impl-65230.stderr similarity index 81% rename from tests/ui/issues/issue-65230.stderr rename to tests/ui/associated-types/mismatched-types-in-trait-impl-65230.stderr index c959658c0ce27..c34685aacad5c 100644 --- a/tests/ui/issues/issue-65230.stderr +++ b/tests/ui/associated-types/mismatched-types-in-trait-impl-65230.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-65230.rs:8:13 + --> $DIR/mismatched-types-in-trait-impl-65230.rs:9:13 | LL | impl T1 for &dyn T2 {} | ^^^^^^^ lifetime mismatch @@ -7,7 +7,7 @@ LL | impl T1 for &dyn T2 {} = note: expected trait `<&dyn T2 as T0>` found trait `<&(dyn T2 + 'static) as T0>` note: the anonymous lifetime as defined here... - --> $DIR/issue-65230.rs:8:13 + --> $DIR/mismatched-types-in-trait-impl-65230.rs:9:13 | LL | impl T1 for &dyn T2 {} | ^ diff --git a/tests/ui/issues/issue-72076.rs b/tests/ui/associated-types/missing-default-associated-type-72076.rs similarity index 64% rename from tests/ui/issues/issue-72076.rs rename to tests/ui/associated-types/missing-default-associated-type-72076.rs index 1659044a64fe1..c25bdff16fd2e 100644 --- a/tests/ui/issues/issue-72076.rs +++ b/tests/ui/associated-types/missing-default-associated-type-72076.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/72076 trait X { type S; fn f() -> Self::S {} //~ ERROR mismatched types diff --git a/tests/ui/issues/issue-72076.stderr b/tests/ui/associated-types/missing-default-associated-type-72076.stderr similarity index 90% rename from tests/ui/issues/issue-72076.stderr rename to tests/ui/associated-types/missing-default-associated-type-72076.stderr index a08704c907327..c91dbb6d5c858 100644 --- a/tests/ui/issues/issue-72076.stderr +++ b/tests/ui/associated-types/missing-default-associated-type-72076.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-72076.rs:3:23 + --> $DIR/missing-default-associated-type-72076.rs:4:23 | LL | fn f() -> Self::S {} | ^^ expected associated type, found `()` diff --git a/tests/ui/issues/issue-66702-break-outside-loop-val.rs b/tests/ui/async-await/labeled-break-in-async-fn-ice-66702-.rs similarity index 82% rename from tests/ui/issues/issue-66702-break-outside-loop-val.rs rename to tests/ui/async-await/labeled-break-in-async-fn-ice-66702-.rs index 05b86cbbf8f05..dd0ebcb2a3587 100644 --- a/tests/ui/issues/issue-66702-break-outside-loop-val.rs +++ b/tests/ui/async-await/labeled-break-in-async-fn-ice-66702-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/66702- // Breaks with values inside closures used to ICE (#66863) fn main() { diff --git a/tests/ui/issues/issue-66702-break-outside-loop-val.stderr b/tests/ui/async-await/labeled-break-in-async-fn-ice-66702-.stderr similarity index 86% rename from tests/ui/issues/issue-66702-break-outside-loop-val.stderr rename to tests/ui/async-await/labeled-break-in-async-fn-ice-66702-.stderr index f92ede311afb4..a439440914e16 100644 --- a/tests/ui/issues/issue-66702-break-outside-loop-val.stderr +++ b/tests/ui/async-await/labeled-break-in-async-fn-ice-66702-.stderr @@ -1,5 +1,5 @@ error[E0767]: use of unreachable label `'some_label` - --> $DIR/issue-66702-break-outside-loop-val.rs:5:18 + --> $DIR/labeled-break-in-async-fn-ice-66702-.rs:6:18 | LL | 'some_label: loop { | ----------- unreachable label defined here @@ -9,7 +9,7 @@ LL | || break 'some_label (); = note: labels are unreachable through functions, closures, async blocks and modules error[E0267]: `break` inside of a closure - --> $DIR/issue-66702-break-outside-loop-val.rs:5:12 + --> $DIR/labeled-break-in-async-fn-ice-66702-.rs:6:12 | LL | || break 'some_label (); | -- ^^^^^^^^^^^^^^^^^^^^ cannot `break` inside of a closure diff --git a/tests/ui/issues/issue-77218/issue-77218.fixed b/tests/ui/binding/invalid-assignment-in-while-77218.fixed similarity index 73% rename from tests/ui/issues/issue-77218/issue-77218.fixed rename to tests/ui/binding/invalid-assignment-in-while-77218.fixed index 6ce9dd1c2c57a..aa662ead21ac8 100644 --- a/tests/ui/issues/issue-77218/issue-77218.fixed +++ b/tests/ui/binding/invalid-assignment-in-while-77218.fixed @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/77218 //@ run-rustfix fn main() { let value = [7u8]; diff --git a/tests/ui/issues/issue-77218/issue-77218.rs b/tests/ui/binding/invalid-assignment-in-while-77218.rs similarity index 73% rename from tests/ui/issues/issue-77218/issue-77218.rs rename to tests/ui/binding/invalid-assignment-in-while-77218.rs index 14edc065d0e63..9f249180e83a2 100644 --- a/tests/ui/issues/issue-77218/issue-77218.rs +++ b/tests/ui/binding/invalid-assignment-in-while-77218.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/77218 //@ run-rustfix fn main() { let value = [7u8]; diff --git a/tests/ui/issues/issue-77218/issue-77218.stderr b/tests/ui/binding/invalid-assignment-in-while-77218.stderr similarity index 89% rename from tests/ui/issues/issue-77218/issue-77218.stderr rename to tests/ui/binding/invalid-assignment-in-while-77218.stderr index e98e69314d91d..0545a01309978 100644 --- a/tests/ui/issues/issue-77218/issue-77218.stderr +++ b/tests/ui/binding/invalid-assignment-in-while-77218.stderr @@ -1,5 +1,5 @@ error[E0070]: invalid left-hand side of assignment - --> $DIR/issue-77218.rs:4:19 + --> $DIR/invalid-assignment-in-while-77218.rs:5:19 | LL | while Some(0) = value.get(0) {} | - ^ diff --git a/tests/ui/issues/issue-77218/issue-77218-2.fixed b/tests/ui/binding/invalid-assignment-in-while-condition-77218-2.fixed similarity index 73% rename from tests/ui/issues/issue-77218/issue-77218-2.fixed rename to tests/ui/binding/invalid-assignment-in-while-condition-77218-2.fixed index 98d79b5da6561..613bfb82dfd39 100644 --- a/tests/ui/issues/issue-77218/issue-77218-2.fixed +++ b/tests/ui/binding/invalid-assignment-in-while-condition-77218-2.fixed @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/77218-2 //@ run-rustfix fn main() { let value = [7u8]; diff --git a/tests/ui/issues/issue-77218/issue-77218-2.rs b/tests/ui/binding/invalid-assignment-in-while-condition-77218-2.rs similarity index 73% rename from tests/ui/issues/issue-77218/issue-77218-2.rs rename to tests/ui/binding/invalid-assignment-in-while-condition-77218-2.rs index 3be38f8f721da..595aa5eb7f8c9 100644 --- a/tests/ui/issues/issue-77218/issue-77218-2.rs +++ b/tests/ui/binding/invalid-assignment-in-while-condition-77218-2.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/77218-2 //@ run-rustfix fn main() { let value = [7u8]; diff --git a/tests/ui/issues/issue-77218/issue-77218-2.stderr b/tests/ui/binding/invalid-assignment-in-while-condition-77218-2.stderr similarity index 87% rename from tests/ui/issues/issue-77218/issue-77218-2.stderr rename to tests/ui/binding/invalid-assignment-in-while-condition-77218-2.stderr index dfed0b6e67e33..fa39640574300 100644 --- a/tests/ui/issues/issue-77218/issue-77218-2.stderr +++ b/tests/ui/binding/invalid-assignment-in-while-condition-77218-2.stderr @@ -1,5 +1,5 @@ error[E0070]: invalid left-hand side of assignment - --> $DIR/issue-77218-2.rs:4:19 + --> $DIR/invalid-assignment-in-while-condition-77218-2.rs:5:19 | LL | while Some(0) = value.get(0) { | - ^ diff --git a/tests/ui/issues/issue-8391.rs b/tests/ui/binding/match-with-at-binding-8391.rs similarity index 73% rename from tests/ui/issues/issue-8391.rs rename to tests/ui/binding/match-with-at-binding-8391.rs index 20698eed18b7b..bc4e7be798929 100644 --- a/tests/ui/issues/issue-8391.rs +++ b/tests/ui/binding/match-with-at-binding-8391.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8391 //@ run-pass fn main() { diff --git a/tests/ui/issues/issue-7092.rs b/tests/ui/binding/method-call-nonsensical-pattern-binding-7092.rs similarity index 86% rename from tests/ui/issues/issue-7092.rs rename to tests/ui/binding/method-call-nonsensical-pattern-binding-7092.rs index fab18bd7cf759..4cb04cdf5bef8 100644 --- a/tests/ui/issues/issue-7092.rs +++ b/tests/ui/binding/method-call-nonsensical-pattern-binding-7092.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7092 enum Whatever { } diff --git a/tests/ui/issues/issue-7092.stderr b/tests/ui/binding/method-call-nonsensical-pattern-binding-7092.stderr similarity index 86% rename from tests/ui/issues/issue-7092.stderr rename to tests/ui/binding/method-call-nonsensical-pattern-binding-7092.stderr index e2e5748674615..1f8ff2d8df1dc 100644 --- a/tests/ui/issues/issue-7092.stderr +++ b/tests/ui/binding/method-call-nonsensical-pattern-binding-7092.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-7092.rs:6:9 + --> $DIR/method-call-nonsensical-pattern-binding-7092.rs:7:9 | LL | match x { | - this expression has type `Whatever` diff --git a/tests/ui/issues/issue-8860.rs b/tests/ui/binding/ref-pattern-drop-behavior-8860.rs similarity index 94% rename from tests/ui/issues/issue-8860.rs rename to tests/ui/binding/ref-pattern-drop-behavior-8860.rs index 3af61576fe1a2..1a67caf021cf7 100644 --- a/tests/ui/issues/issue-8860.rs +++ b/tests/ui/binding/ref-pattern-drop-behavior-8860.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8860 //@ run-pass // FIXME(static_mut_refs): this could use an atomic #![allow(static_mut_refs)] diff --git a/tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.rs b/tests/ui/binop/binary-operation-error-on-function-70724-.rs similarity index 77% rename from tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.rs rename to tests/ui/binop/binary-operation-error-on-function-70724-.rs index c2683157f797f..3e560c3564b27 100644 --- a/tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.rs +++ b/tests/ui/binop/binary-operation-error-on-function-70724-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/70724- fn a() -> i32 { 3 } diff --git a/tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr b/tests/ui/binop/binary-operation-error-on-function-70724-.stderr similarity index 87% rename from tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr rename to tests/ui/binop/binary-operation-error-on-function-70724-.stderr index 736002c9335a3..1614bfdccba1d 100644 --- a/tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr +++ b/tests/ui/binop/binary-operation-error-on-function-70724-.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `==` cannot be applied to type `fn() -> i32 {a}` - --> $DIR/issue-70724-add_type_neq_err_label-unwrap.rs:6:5 + --> $DIR/binary-operation-error-on-function-70724-.rs:7:5 | LL | assert_eq!(a, 0); | ^^^^^^^^^^^^^^^^ @@ -10,7 +10,7 @@ LL | assert_eq!(a, 0); = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0308]: mismatched types - --> $DIR/issue-70724-add_type_neq_err_label-unwrap.rs:6:5 + --> $DIR/binary-operation-error-on-function-70724-.rs:7:5 | LL | assert_eq!(a, 0); | ^^^^^^^^^^^^^^^^ expected fn item, found integer @@ -20,7 +20,7 @@ LL | assert_eq!(a, 0); = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0277]: `fn() -> i32 {a}` doesn't implement `Debug` - --> $DIR/issue-70724-add_type_neq_err_label-unwrap.rs:6:5 + --> $DIR/binary-operation-error-on-function-70724-.rs:7:5 | LL | fn a() -> i32 { | - consider calling this function diff --git a/tests/ui/issues/issue-59488.rs b/tests/ui/binop/function-comparison-errors-59488.rs similarity index 95% rename from tests/ui/issues/issue-59488.rs rename to tests/ui/binop/function-comparison-errors-59488.rs index 384501e3e5dfd..8ded781ef9547 100644 --- a/tests/ui/issues/issue-59488.rs +++ b/tests/ui/binop/function-comparison-errors-59488.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/59488 fn foo() -> i32 { 42 } diff --git a/tests/ui/issues/issue-59488.stderr b/tests/ui/binop/function-comparison-errors-59488.stderr similarity index 84% rename from tests/ui/issues/issue-59488.stderr rename to tests/ui/binop/function-comparison-errors-59488.stderr index b6611ad63a810..615458bc45b40 100644 --- a/tests/ui/issues/issue-59488.stderr +++ b/tests/ui/binop/function-comparison-errors-59488.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `>` cannot be applied to type `fn() -> i32 {foo}` - --> $DIR/issue-59488.rs:14:9 + --> $DIR/function-comparison-errors-59488.rs:15:9 | LL | foo > 12; | --- ^ -- {integer} @@ -12,7 +12,7 @@ LL | foo() > 12; | ++ error[E0308]: mismatched types - --> $DIR/issue-59488.rs:14:11 + --> $DIR/function-comparison-errors-59488.rs:15:11 | LL | foo > 12; | ^^ expected fn item, found `i32` @@ -21,7 +21,7 @@ LL | foo > 12; found type `i32` error[E0369]: binary operation `>` cannot be applied to type `fn(i64) -> i64 {bar}` - --> $DIR/issue-59488.rs:18:9 + --> $DIR/function-comparison-errors-59488.rs:19:9 | LL | bar > 13; | --- ^ -- {integer} @@ -34,7 +34,7 @@ LL | bar(/* i64 */) > 13; | +++++++++++ error[E0308]: mismatched types - --> $DIR/issue-59488.rs:18:11 + --> $DIR/function-comparison-errors-59488.rs:19:11 | LL | bar > 13; | ^^ expected fn item, found `i64` @@ -43,7 +43,7 @@ LL | bar > 13; found type `i64` error[E0369]: binary operation `>` cannot be applied to type `fn() -> i32 {foo}` - --> $DIR/issue-59488.rs:22:9 + --> $DIR/function-comparison-errors-59488.rs:23:9 | LL | foo > foo; | --- ^ --- fn() -> i32 {foo} @@ -56,7 +56,7 @@ LL | foo() > foo(); | ++ ++ error[E0369]: binary operation `>` cannot be applied to type `fn() -> i32 {foo}` - --> $DIR/issue-59488.rs:25:9 + --> $DIR/function-comparison-errors-59488.rs:26:9 | LL | foo > bar; | --- ^ --- fn(i64) -> i64 {bar} @@ -64,7 +64,7 @@ LL | foo > bar; | fn() -> i32 {foo} error[E0308]: mismatched types - --> $DIR/issue-59488.rs:25:11 + --> $DIR/function-comparison-errors-59488.rs:26:11 | LL | foo > bar; | ^^^ expected fn item, found a different fn item @@ -73,7 +73,7 @@ LL | foo > bar; found fn item `fn(i64) -> i64 {bar}` error[E0369]: binary operation `==` cannot be applied to type `fn(usize) -> Foo {Foo::Bar}` - --> $DIR/issue-59488.rs:30:5 + --> $DIR/function-comparison-errors-59488.rs:31:5 | LL | assert_eq!(Foo::Bar, i); | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -84,7 +84,7 @@ LL | assert_eq!(Foo::Bar, i); = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0277]: `fn(usize) -> Foo {Foo::Bar}` doesn't implement `Debug` - --> $DIR/issue-59488.rs:30:5 + --> $DIR/function-comparison-errors-59488.rs:31:5 | LL | assert_eq!(Foo::Bar, i); | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `Debug` is not implemented for fn item `fn(usize) -> Foo {Foo::Bar}` @@ -92,7 +92,7 @@ LL | assert_eq!(Foo::Bar, i); = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0277]: `fn(usize) -> Foo {Foo::Bar}` doesn't implement `Debug` - --> $DIR/issue-59488.rs:30:5 + --> $DIR/function-comparison-errors-59488.rs:31:5 | LL | assert_eq!(Foo::Bar, i); | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `Debug` is not implemented for fn item `fn(usize) -> Foo {Foo::Bar}` diff --git a/tests/ui/issues/issue-6738.rs b/tests/ui/binop/struct-field-generic-type-binary-assignment-error-6738.rs similarity index 79% rename from tests/ui/issues/issue-6738.rs rename to tests/ui/binop/struct-field-generic-type-binary-assignment-error-6738.rs index a2f8dfe9c493c..856caa2b297a0 100644 --- a/tests/ui/issues/issue-6738.rs +++ b/tests/ui/binop/struct-field-generic-type-binary-assignment-error-6738.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/6738 struct Foo { x: T, } diff --git a/tests/ui/issues/issue-6738.stderr b/tests/ui/binop/struct-field-generic-type-binary-assignment-error-6738.stderr similarity index 86% rename from tests/ui/issues/issue-6738.stderr rename to tests/ui/binop/struct-field-generic-type-binary-assignment-error-6738.stderr index f22d6a2e4686c..060d33079d339 100644 --- a/tests/ui/issues/issue-6738.stderr +++ b/tests/ui/binop/struct-field-generic-type-binary-assignment-error-6738.stderr @@ -1,5 +1,5 @@ error[E0368]: binary assignment operation `+=` cannot be applied to type `T` - --> $DIR/issue-6738.rs:6:9 + --> $DIR/struct-field-generic-type-binary-assignment-error-6738.rs:7:9 | LL | self.x += v.x; | ------^^^^^^^ diff --git a/tests/ui/issues/auxiliary/issue-5518.rs b/tests/ui/borrowck/auxiliary/aux-5518.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-5518.rs rename to tests/ui/borrowck/auxiliary/aux-5518.rs diff --git a/tests/ui/issues/auxiliary/iss.rs b/tests/ui/borrowck/auxiliary/iss.rs similarity index 100% rename from tests/ui/issues/auxiliary/iss.rs rename to tests/ui/borrowck/auxiliary/iss.rs diff --git a/tests/ui/issues/issue-61108.rs b/tests/ui/borrowck/borrow-of-moved-value-in-for-loop-61108.rs similarity index 79% rename from tests/ui/issues/issue-61108.rs rename to tests/ui/borrowck/borrow-of-moved-value-in-for-loop-61108.rs index 0a883b9581835..d2e11b2dbffe9 100644 --- a/tests/ui/issues/issue-61108.rs +++ b/tests/ui/borrowck/borrow-of-moved-value-in-for-loop-61108.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/61108 fn main() { let mut bad_letters = vec!['e', 't', 'o', 'i']; for l in bad_letters { diff --git a/tests/ui/issues/issue-61108.stderr b/tests/ui/borrowck/borrow-of-moved-value-in-for-loop-61108.stderr similarity index 93% rename from tests/ui/issues/issue-61108.stderr rename to tests/ui/borrowck/borrow-of-moved-value-in-for-loop-61108.stderr index d018986efecec..4c3fa5e56dc9b 100644 --- a/tests/ui/issues/issue-61108.stderr +++ b/tests/ui/borrowck/borrow-of-moved-value-in-for-loop-61108.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `bad_letters` - --> $DIR/issue-61108.rs:6:5 + --> $DIR/borrow-of-moved-value-in-for-loop-61108.rs:7:5 | LL | let mut bad_letters = vec!['e', 't', 'o', 'i']; | --------------- move occurs because `bad_letters` has type `Vec`, which does not implement the `Copy` trait diff --git a/tests/ui/issues/issue-5884.rs b/tests/ui/borrowck/borrowed-pointer-in-struct-5884.rs similarity index 82% rename from tests/ui/issues/issue-5884.rs rename to tests/ui/borrowck/borrowed-pointer-in-struct-5884.rs index 559b897395d02..d2f17cf905d33 100644 --- a/tests/ui/issues/issue-5884.rs +++ b/tests/ui/borrowck/borrowed-pointer-in-struct-5884.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5884 //@ build-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-6919.rs b/tests/ui/borrowck/deref-separate-compile-unit-6919.rs similarity index 73% rename from tests/ui/issues/issue-6919.rs rename to tests/ui/borrowck/deref-separate-compile-unit-6919.rs index 7fb8a2f33bc9c..7f8ccedd0d5ea 100644 --- a/tests/ui/issues/issue-6919.rs +++ b/tests/ui/borrowck/deref-separate-compile-unit-6919.rs @@ -1,8 +1,8 @@ +// https://github.com/rust-lang/rust/issues/6919 //@ run-pass #![allow(unused_attributes)] //@ aux-build:iss.rs - extern crate issue6919_3; pub fn main() { diff --git a/tests/ui/issues/issue-5550.rs b/tests/ui/borrowck/incorrect-loan-error-on-local-update-5550.rs similarity index 79% rename from tests/ui/issues/issue-5550.rs rename to tests/ui/borrowck/incorrect-loan-error-on-local-update-5550.rs index 41de8ee5d32c9..2258d76865751 100644 --- a/tests/ui/issues/issue-5550.rs +++ b/tests/ui/borrowck/incorrect-loan-error-on-local-update-5550.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5550 //@ run-pass #![allow(unused_assignments)] diff --git a/tests/ui/issues/issue-65131.rs b/tests/ui/borrowck/multiple-mutable-borrows-error-65131.rs similarity index 89% rename from tests/ui/issues/issue-65131.rs rename to tests/ui/borrowck/multiple-mutable-borrows-error-65131.rs index 8b5345da900aa..ccf8b00a78a2d 100644 --- a/tests/ui/issues/issue-65131.rs +++ b/tests/ui/borrowck/multiple-mutable-borrows-error-65131.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/65131 fn get_pair(_a: &mut u32, _b: &mut u32) {} macro_rules! x10 { diff --git a/tests/ui/issues/issue-65131.stderr b/tests/ui/borrowck/multiple-mutable-borrows-error-65131.stderr similarity index 87% rename from tests/ui/issues/issue-65131.stderr rename to tests/ui/borrowck/multiple-mutable-borrows-error-65131.stderr index 70e85b584bd22..1d97403923f99 100644 --- a/tests/ui/issues/issue-65131.stderr +++ b/tests/ui/borrowck/multiple-mutable-borrows-error-65131.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/issue-65131.rs:14:22 + --> $DIR/multiple-mutable-borrows-error-65131.rs:15:22 | LL | get_pair(&mut x, &mut x); | -------- ------ ^^^^^^ second mutable borrow occurs here diff --git a/tests/ui/issues/issue-61623.rs b/tests/ui/borrowck/mutable-borrow-behind-reference-61623.rs similarity index 80% rename from tests/ui/issues/issue-61623.rs rename to tests/ui/borrowck/mutable-borrow-behind-reference-61623.rs index 82df50d9dc34f..ae7bb1c0a76b4 100644 --- a/tests/ui/issues/issue-61623.rs +++ b/tests/ui/borrowck/mutable-borrow-behind-reference-61623.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/61623 fn f1<'a>(_: &'a mut ()) {} fn f2

(_: P, _: ()) {} diff --git a/tests/ui/issues/issue-61623.stderr b/tests/ui/borrowck/mutable-borrow-behind-reference-61623.stderr similarity index 89% rename from tests/ui/issues/issue-61623.stderr rename to tests/ui/borrowck/mutable-borrow-behind-reference-61623.stderr index be6e28edfc24f..cc7761acda9de 100644 --- a/tests/ui/issues/issue-61623.stderr +++ b/tests/ui/borrowck/mutable-borrow-behind-reference-61623.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*x.1` as mutable, as it is behind a `&` reference - --> $DIR/issue-61623.rs:6:19 + --> $DIR/mutable-borrow-behind-reference-61623.rs:7:19 | LL | f2(|| x.0, f1(x.1)) | ^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable diff --git a/tests/ui/issues/issue-78192.rs b/tests/ui/borrowck/pointer-reassignment-after-deref-78192.rs similarity index 82% rename from tests/ui/issues/issue-78192.rs rename to tests/ui/borrowck/pointer-reassignment-after-deref-78192.rs index bec2a82910cfa..99a1d37eb4de7 100644 --- a/tests/ui/issues/issue-78192.rs +++ b/tests/ui/borrowck/pointer-reassignment-after-deref-78192.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/78192 //@ run-pass #![allow(unused_assignments)] diff --git a/tests/ui/issues/issue-7660.rs b/tests/ui/borrowck/rvalue-lifetime-match-equivalence-7660.rs similarity index 88% rename from tests/ui/issues/issue-7660.rs rename to tests/ui/borrowck/rvalue-lifetime-match-equivalence-7660.rs index 104cdad8f7bb7..90526de14e758 100644 --- a/tests/ui/issues/issue-7660.rs +++ b/tests/ui/borrowck/rvalue-lifetime-match-equivalence-7660.rs @@ -1,9 +1,9 @@ +// https://github.com/rust-lang/rust/issues/7660 //@ run-pass #![allow(unused_variables)] // Regression test for issue 7660 // rvalue lifetime too short when equivalent `match` works - use std::collections::HashMap; struct A(isize, isize); diff --git a/tests/ui/issues/issue-5708.rs b/tests/ui/borrowck/struct-with-reference-to-trait-5708.rs similarity index 90% rename from tests/ui/issues/issue-5708.rs rename to tests/ui/borrowck/struct-with-reference-to-trait-5708.rs index 6fa3cfa472454..7477a29fb31d3 100644 --- a/tests/ui/issues/issue-5708.rs +++ b/tests/ui/borrowck/struct-with-reference-to-trait-5708.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5708 //@ run-pass #![allow(unused_variables)] /* @@ -10,14 +11,14 @@ This does not occur with concrete types, only with references to traits. */ - // original trait Inner { fn print(&self); } impl Inner for isize { - fn print(&self) { print!("Inner: {}\n", *self); } + fn print(&self) { print!("Inner: {} +", *self); } } struct Outer<'a> { @@ -38,7 +39,6 @@ pub fn main() { outer.inner.print(); } - // minimal pub trait MyTrait { fn dummy(&self, t: T) -> T { panic!() } diff --git a/tests/ui/borrowck/trait-method-lifetime-substitution-5518.rs b/tests/ui/borrowck/trait-method-lifetime-substitution-5518.rs new file mode 100644 index 0000000000000..f254030a011b2 --- /dev/null +++ b/tests/ui/borrowck/trait-method-lifetime-substitution-5518.rs @@ -0,0 +1,7 @@ +// https://github.com/rust-lang/rust/issues/5518 +//@ run-pass +//@ aux-build:aux-5518.rs + +extern crate aux_5518 as other; + +fn main() {} diff --git a/tests/ui/issues/issue-6557.rs b/tests/ui/box/box-patterns-feature-usage-6557.rs similarity index 72% rename from tests/ui/issues/issue-6557.rs rename to tests/ui/box/box-patterns-feature-usage-6557.rs index 64a025a294f68..e0d9b25c366d4 100644 --- a/tests/ui/issues/issue-6557.rs +++ b/tests/ui/box/box-patterns-feature-usage-6557.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/6557 //@ check-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741-1.rs b/tests/ui/box/boxed-value-matching-57741-1.rs similarity index 89% rename from tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741-1.rs rename to tests/ui/box/boxed-value-matching-57741-1.rs index d0aae23b2fce6..3f7ed26999b06 100644 --- a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741-1.rs +++ b/tests/ui/box/boxed-value-matching-57741-1.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57741-1 #![allow(warnings)] // This tests that the `help: consider dereferencing the boxed value` suggestion isn't made diff --git a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741-1.stderr b/tests/ui/box/boxed-value-matching-57741-1.stderr similarity index 88% rename from tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741-1.stderr rename to tests/ui/box/boxed-value-matching-57741-1.stderr index 76f03bab6d157..39fac8b750403 100644 --- a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741-1.stderr +++ b/tests/ui/box/boxed-value-matching-57741-1.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-57741-1.rs:14:9 + --> $DIR/boxed-value-matching-57741-1.rs:15:9 | LL | let y = match x { | - this expression has type `Box` @@ -10,7 +10,7 @@ LL | S::A { a } | S::B { b: a } => a, found enum `S` error[E0308]: mismatched types - --> $DIR/issue-57741-1.rs:14:22 + --> $DIR/boxed-value-matching-57741-1.rs:15:22 | LL | let y = match x { | - this expression has type `Box` diff --git a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.fixed b/tests/ui/box/dereferencing-boxed-enum-in-match-57741.fixed similarity index 92% rename from tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.fixed rename to tests/ui/box/dereferencing-boxed-enum-in-match-57741.fixed index 1823f0d3d4ccf..ee796b56272de 100644 --- a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.fixed +++ b/tests/ui/box/dereferencing-boxed-enum-in-match-57741.fixed @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57741 //@ run-rustfix #![allow(warnings)] diff --git a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.rs b/tests/ui/box/dereferencing-boxed-enum-in-match-57741.rs similarity index 92% rename from tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.rs rename to tests/ui/box/dereferencing-boxed-enum-in-match-57741.rs index 47ab91177e057..3a45a8b56ff1a 100644 --- a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.rs +++ b/tests/ui/box/dereferencing-boxed-enum-in-match-57741.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57741 //@ run-rustfix #![allow(warnings)] diff --git a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.stderr b/tests/ui/box/dereferencing-boxed-enum-in-match-57741.stderr similarity index 87% rename from tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.stderr rename to tests/ui/box/dereferencing-boxed-enum-in-match-57741.stderr index 62d83a5461484..c07387b21bd05 100644 --- a/tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.stderr +++ b/tests/ui/box/dereferencing-boxed-enum-in-match-57741.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-57741.rs:20:9 + --> $DIR/dereferencing-boxed-enum-in-match-57741.rs:21:9 | LL | let y = match x { | - this expression has type `Box` @@ -14,7 +14,7 @@ LL | let y = match *x { | + error[E0308]: mismatched types - --> $DIR/issue-57741.rs:20:19 + --> $DIR/dereferencing-boxed-enum-in-match-57741.rs:21:19 | LL | let y = match x { | - this expression has type `Box` @@ -29,7 +29,7 @@ LL | let y = match *x { | + error[E0308]: mismatched types - --> $DIR/issue-57741.rs:27:9 + --> $DIR/dereferencing-boxed-enum-in-match-57741.rs:28:9 | LL | let y = match x { | - this expression has type `Box` @@ -44,7 +44,7 @@ LL | let y = match *x { | + error[E0308]: mismatched types - --> $DIR/issue-57741.rs:27:22 + --> $DIR/dereferencing-boxed-enum-in-match-57741.rs:28:22 | LL | let y = match x { | - this expression has type `Box` diff --git a/tests/ui/issues/issue-6318.rs b/tests/ui/cast/owned-struct-to-trait-cast-6318.rs similarity index 84% rename from tests/ui/issues/issue-6318.rs rename to tests/ui/cast/owned-struct-to-trait-cast-6318.rs index d3f08285a93b3..8cfc77c427400 100644 --- a/tests/ui/issues/issue-6318.rs +++ b/tests/ui/cast/owned-struct-to-trait-cast-6318.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/6318 //@ run-pass pub enum Thing { diff --git a/tests/ui/issues/issue-6153.rs b/tests/ui/closures/closure-mut-argument-6153.rs similarity index 83% rename from tests/ui/issues/issue-6153.rs rename to tests/ui/closures/closure-mut-argument-6153.rs index cd78c85d94b55..ac19c2bd15fcf 100644 --- a/tests/ui/issues/issue-6153.rs +++ b/tests/ui/closures/closure-mut-argument-6153.rs @@ -1,6 +1,6 @@ +// https://github.com/rust-lang/rust/issues/6153 //@ run-pass - fn swap(f: F) -> Vec where F: FnOnce(Vec) -> Vec { let x = vec![1, 2, 3]; f(x) diff --git a/tests/ui/issues/issue-59494.rs b/tests/ui/closures/generic-typed-nested-closures-59494.rs similarity index 91% rename from tests/ui/issues/issue-59494.rs rename to tests/ui/closures/generic-typed-nested-closures-59494.rs index b4d50bd4ce795..04d7b00ff7fab 100644 --- a/tests/ui/issues/issue-59494.rs +++ b/tests/ui/closures/generic-typed-nested-closures-59494.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/59494 fn t7p(f: impl Fn(B) -> C, g: impl Fn(A) -> B) -> impl Fn(A) -> C { move |a: A| -> C { f(g(a)) } } diff --git a/tests/ui/issues/issue-59494.stderr b/tests/ui/closures/generic-typed-nested-closures-59494.stderr similarity index 83% rename from tests/ui/issues/issue-59494.stderr rename to tests/ui/closures/generic-typed-nested-closures-59494.stderr index 33d3e48c1aac8..9706fea82a300 100644 --- a/tests/ui/issues/issue-59494.stderr +++ b/tests/ui/closures/generic-typed-nested-closures-59494.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-59494.rs:20:40 + --> $DIR/generic-typed-nested-closures-59494.rs:21:40 | LL | let t7 = |env| |a| |b| t7p(f, g)(((env, a), b)); | ^^^ cyclic type of infinite size diff --git a/tests/ui/issues/issue-62480.rs b/tests/ui/closures/labeled-break-inside-closure-62480.rs similarity index 87% rename from tests/ui/issues/issue-62480.rs rename to tests/ui/closures/labeled-break-inside-closure-62480.rs index 94a9c2ab8be8e..620f1e220fe42 100644 --- a/tests/ui/issues/issue-62480.rs +++ b/tests/ui/closures/labeled-break-inside-closure-62480.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/62480 fn main() { // This used to ICE during liveness check because `target_id` passed to // `propagate_through_expr` would be the closure and not the `loop`, which wouldn't be found in diff --git a/tests/ui/issues/issue-62480.stderr b/tests/ui/closures/labeled-break-inside-closure-62480.stderr similarity index 85% rename from tests/ui/issues/issue-62480.stderr rename to tests/ui/closures/labeled-break-inside-closure-62480.stderr index db230537037a4..a4ca60bb97365 100644 --- a/tests/ui/issues/issue-62480.stderr +++ b/tests/ui/closures/labeled-break-inside-closure-62480.stderr @@ -1,5 +1,5 @@ error[E0767]: use of unreachable label `'a` - --> $DIR/issue-62480.rs:6:18 + --> $DIR/labeled-break-inside-closure-62480.rs:7:18 | LL | 'a: { | -- unreachable label defined here @@ -9,7 +9,7 @@ LL | || break 'a = note: labels are unreachable through functions, closures, async blocks and modules error[E0267]: `break` inside of a closure - --> $DIR/issue-62480.rs:6:12 + --> $DIR/labeled-break-inside-closure-62480.rs:7:12 | LL | || break 'a | -- ^^^^^^^^ cannot `break` inside of a closure diff --git a/tests/ui/issues/issue-64559.rs b/tests/ui/closures/moved-value-in-closure-64559.rs similarity index 72% rename from tests/ui/issues/issue-64559.rs rename to tests/ui/closures/moved-value-in-closure-64559.rs index 71e054b5d9876..c13f91c082a39 100644 --- a/tests/ui/issues/issue-64559.rs +++ b/tests/ui/closures/moved-value-in-closure-64559.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/64559 fn main() { let orig = vec![true]; for _val in orig {} diff --git a/tests/ui/issues/issue-64559.stderr b/tests/ui/closures/moved-value-in-closure-64559.stderr similarity index 94% rename from tests/ui/issues/issue-64559.stderr rename to tests/ui/closures/moved-value-in-closure-64559.stderr index 0cab37553406c..3f8ecea6d5d45 100644 --- a/tests/ui/issues/issue-64559.stderr +++ b/tests/ui/closures/moved-value-in-closure-64559.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `orig` - --> $DIR/issue-64559.rs:4:20 + --> $DIR/moved-value-in-closure-64559.rs:5:20 | LL | let orig = vec![true]; | ---- move occurs because `orig` has type `Vec`, which does not implement the `Copy` trait diff --git a/tests/ui/issues/issue-66308.rs b/tests/ui/codegen/emscripten-llvm-crash-regression-66308.rs similarity index 77% rename from tests/ui/issues/issue-66308.rs rename to tests/ui/codegen/emscripten-llvm-crash-regression-66308.rs index 41f81323e6fbf..c18d6761e8872 100644 --- a/tests/ui/issues/issue-66308.rs +++ b/tests/ui/codegen/emscripten-llvm-crash-regression-66308.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/66308 //@ build-pass //@ compile-flags: --crate-type lib -C opt-level=0 diff --git a/tests/ui/issues/issue-76042.rs b/tests/ui/codegen/i128-shift-overflow-check-76042.rs similarity index 85% rename from tests/ui/issues/issue-76042.rs rename to tests/ui/codegen/i128-shift-overflow-check-76042.rs index 279e860459d2c..7ae0806216cd6 100644 --- a/tests/ui/issues/issue-76042.rs +++ b/tests/ui/codegen/i128-shift-overflow-check-76042.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/76042 //@ run-pass //@ compile-flags: -Coverflow-checks=off -Ccodegen-units=1 -Copt-level=0 diff --git a/tests/ui/issues/issue-58375-monomorphize-default-impls.rs b/tests/ui/codegen/mono-item-collector-default-impl-58375-.rs similarity index 90% rename from tests/ui/issues/issue-58375-monomorphize-default-impls.rs rename to tests/ui/codegen/mono-item-collector-default-impl-58375-.rs index 769a1176edd36..427735e48f108 100644 --- a/tests/ui/issues/issue-58375-monomorphize-default-impls.rs +++ b/tests/ui/codegen/mono-item-collector-default-impl-58375-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/58375- // Make sure that the mono-item collector does not crash when trying to // instantiate a default impl for DecodeUtf16<::Item> // See https://github.com/rust-lang/rust/issues/58375 diff --git a/tests/ui/issues/auxiliary/issue-8401.rs b/tests/ui/coercion/auxiliary/aux-8401.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-8401.rs rename to tests/ui/coercion/auxiliary/aux-8401.rs diff --git a/tests/ui/issues/issue-8248.rs b/tests/ui/coercion/coerce-mut-trait-object-8248.rs similarity index 81% rename from tests/ui/issues/issue-8248.rs rename to tests/ui/coercion/coerce-mut-trait-object-8248.rs index 95f626658cc67..a45a4d94315f1 100644 --- a/tests/ui/issues/issue-8248.rs +++ b/tests/ui/coercion/coerce-mut-trait-object-8248.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8248 //@ run-pass trait A { diff --git a/tests/ui/issues/issue-8248.stderr b/tests/ui/coercion/coerce-mut-trait-object-8248.stderr similarity index 82% rename from tests/ui/issues/issue-8248.stderr rename to tests/ui/coercion/coerce-mut-trait-object-8248.stderr index 8570bfaefadbe..eab3f58c518bf 100644 --- a/tests/ui/issues/issue-8248.stderr +++ b/tests/ui/coercion/coerce-mut-trait-object-8248.stderr @@ -1,5 +1,5 @@ warning: method `dummy` is never used - --> $DIR/issue-8248.rs:4:8 + --> $DIR/coerce-mut-trait-object-8248.rs:5:8 | LL | trait A { | - method in this trait diff --git a/tests/ui/issues/issue-72002.rs b/tests/ui/coercion/index-coercion-over-indexmut-72002.rs similarity index 90% rename from tests/ui/issues/issue-72002.rs rename to tests/ui/coercion/index-coercion-over-indexmut-72002.rs index ce3463069b881..826cc99fe2ad7 100644 --- a/tests/ui/issues/issue-72002.rs +++ b/tests/ui/coercion/index-coercion-over-indexmut-72002.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/72002 //@ check-pass struct Indexable; diff --git a/tests/ui/issues/issue-8398.rs b/tests/ui/coercion/mut-trait-object-coercion-8398.rs similarity index 79% rename from tests/ui/issues/issue-8398.rs rename to tests/ui/coercion/mut-trait-object-coercion-8398.rs index 7d100b855fd1a..d87d27582bab6 100644 --- a/tests/ui/issues/issue-8398.rs +++ b/tests/ui/coercion/mut-trait-object-coercion-8398.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8398 //@ check-pass #![allow(dead_code)] diff --git a/tests/ui/coercion/mut-trait-object-coercion-8401.rs b/tests/ui/coercion/mut-trait-object-coercion-8401.rs new file mode 100644 index 0000000000000..f6f6b2789b501 --- /dev/null +++ b/tests/ui/coercion/mut-trait-object-coercion-8401.rs @@ -0,0 +1,7 @@ +// https://github.com/rust-lang/rust/issues/8401 +//@ run-pass +//@ aux-build:aux-8401.rs + +extern crate aux_8401; + +pub fn main() {} diff --git a/tests/ui/issues/issue-57162.rs b/tests/ui/coherence/trait-implementation-coherence-check-57162.rs similarity index 67% rename from tests/ui/issues/issue-57162.rs rename to tests/ui/coherence/trait-implementation-coherence-check-57162.rs index 5e62d0eb010bc..a57e827ca8bf5 100644 --- a/tests/ui/issues/issue-57162.rs +++ b/tests/ui/coherence/trait-implementation-coherence-check-57162.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57162 //@ check-pass trait Foo {} diff --git a/tests/ui/issues/issue-54477-reduced-2.rs b/tests/ui/collections/vecdeque-append-operation-54477-.rs similarity index 94% rename from tests/ui/issues/issue-54477-reduced-2.rs rename to tests/ui/collections/vecdeque-append-operation-54477-.rs index 5f65e54518208..69a7857f55039 100644 --- a/tests/ui/issues/issue-54477-reduced-2.rs +++ b/tests/ui/collections/vecdeque-append-operation-54477-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/54477- //@ run-pass // rust-lang/rust#54477: runtime bug in the VecDeque library that was // exposed by this test case, derived from test suite of crates.io diff --git a/tests/ui/issues/issue-78957.rs b/tests/ui/const-generics/invalid-attributes-on-const-params-78957.rs similarity index 95% rename from tests/ui/issues/issue-78957.rs rename to tests/ui/const-generics/invalid-attributes-on-const-params-78957.rs index 567c59fd560d9..29f8efcc922e8 100644 --- a/tests/ui/issues/issue-78957.rs +++ b/tests/ui/const-generics/invalid-attributes-on-const-params-78957.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/78957 #![deny(unused_attributes)] use std::marker::PhantomData; diff --git a/tests/ui/issues/issue-78957.stderr b/tests/ui/const-generics/invalid-attributes-on-const-params-78957.stderr similarity index 79% rename from tests/ui/issues/issue-78957.stderr rename to tests/ui/const-generics/invalid-attributes-on-const-params-78957.stderr index 6de22d6bf79fc..6271384aaf962 100644 --- a/tests/ui/issues/issue-78957.stderr +++ b/tests/ui/const-generics/invalid-attributes-on-const-params-78957.stderr @@ -1,36 +1,36 @@ error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-78957.rs:5:16 + --> $DIR/invalid-attributes-on-const-params-78957.rs:6:16 | LL | pub struct Foo<#[inline] const N: usize>; | ^^^^^^^^^ -------------- not a function or closure error: attribute should be applied to a function definition - --> $DIR/issue-78957.rs:7:16 + --> $DIR/invalid-attributes-on-const-params-78957.rs:8:16 | LL | pub struct Bar<#[cold] const N: usize>; | ^^^^^^^ -------------- not a function definition | = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! note: the lint level is defined here - --> $DIR/issue-78957.rs:1:9 + --> $DIR/invalid-attributes-on-const-params-78957.rs:2:9 | LL | #![deny(unused_attributes)] | ^^^^^^^^^^^^^^^^^ error[E0517]: attribute should be applied to a struct, enum, or union - --> $DIR/issue-78957.rs:10:23 + --> $DIR/invalid-attributes-on-const-params-78957.rs:11:23 | LL | pub struct Baz<#[repr(C)] const N: usize>; | ^ -------------- not a struct, enum, or union error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-78957.rs:13:17 + --> $DIR/invalid-attributes-on-const-params-78957.rs:14:17 | LL | pub struct Foo2<#[inline] 'a>(PhantomData<&'a ()>); | ^^^^^^^^^ -- not a function or closure error: attribute should be applied to a function definition - --> $DIR/issue-78957.rs:15:17 + --> $DIR/invalid-attributes-on-const-params-78957.rs:16:17 | LL | pub struct Bar2<#[cold] 'a>(PhantomData<&'a ()>); | ^^^^^^^ -- not a function definition @@ -38,19 +38,19 @@ LL | pub struct Bar2<#[cold] 'a>(PhantomData<&'a ()>); = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! error[E0517]: attribute should be applied to a struct, enum, or union - --> $DIR/issue-78957.rs:18:24 + --> $DIR/invalid-attributes-on-const-params-78957.rs:19:24 | LL | pub struct Baz2<#[repr(C)] 'a>(PhantomData<&'a ()>); | ^ -- not a struct, enum, or union error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-78957.rs:21:17 + --> $DIR/invalid-attributes-on-const-params-78957.rs:22:17 | LL | pub struct Foo3<#[inline] T>(PhantomData); | ^^^^^^^^^ - not a function or closure error: attribute should be applied to a function definition - --> $DIR/issue-78957.rs:23:17 + --> $DIR/invalid-attributes-on-const-params-78957.rs:24:17 | LL | pub struct Bar3<#[cold] T>(PhantomData); | ^^^^^^^ - not a function definition @@ -58,7 +58,7 @@ LL | pub struct Bar3<#[cold] T>(PhantomData); = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! error[E0517]: attribute should be applied to a struct, enum, or union - --> $DIR/issue-78957.rs:26:24 + --> $DIR/invalid-attributes-on-const-params-78957.rs:27:24 | LL | pub struct Baz3<#[repr(C)] T>(PhantomData); | ^ - not a struct, enum, or union diff --git a/tests/ui/issues/issue-66706.rs b/tests/ui/consts/closure-type-error-during-const-eval-66706.rs similarity index 91% rename from tests/ui/issues/issue-66706.rs rename to tests/ui/consts/closure-type-error-during-const-eval-66706.rs index 87dc3437a57bd..d88aa30615861 100644 --- a/tests/ui/issues/issue-66706.rs +++ b/tests/ui/consts/closure-type-error-during-const-eval-66706.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/66706 fn a() { [0; [|_: _ &_| ()].len()] //~^ ERROR expected one of `,` or `|`, found `&` diff --git a/tests/ui/issues/issue-66706.stderr b/tests/ui/consts/closure-type-error-during-const-eval-66706.stderr similarity index 75% rename from tests/ui/issues/issue-66706.stderr rename to tests/ui/consts/closure-type-error-during-const-eval-66706.stderr index cfe8576400025..e774b1adf1187 100644 --- a/tests/ui/issues/issue-66706.stderr +++ b/tests/ui/consts/closure-type-error-during-const-eval-66706.stderr @@ -1,5 +1,5 @@ error: expected one of `,` or `|`, found `&` - --> $DIR/issue-66706.rs:2:16 + --> $DIR/closure-type-error-during-const-eval-66706.rs:3:16 | LL | [0; [|_: _ &_| ()].len()] | -^ expected one of `,` or `|` @@ -7,13 +7,13 @@ LL | [0; [|_: _ &_| ()].len()] | help: missing `,` error: expected identifier, found reserved identifier `_` - --> $DIR/issue-66706.rs:8:20 + --> $DIR/closure-type-error-during-const-eval-66706.rs:9:20 | LL | [0; [|f @ &ref _| {} ; 0 ].len() ]; | ^ expected identifier, found reserved identifier error: expected one of `,` or `|`, found `&` - --> $DIR/issue-66706.rs:13:17 + --> $DIR/closure-type-error-during-const-eval-66706.rs:14:17 | LL | [0; [|&_: _ &_| {}; 0 ].len()] | -^ expected one of `,` or `|` @@ -21,7 +21,7 @@ LL | [0; [|&_: _ &_| {}; 0 ].len()] | help: missing `,` error: expected identifier, found reserved identifier `_` - --> $DIR/issue-66706.rs:19:26 + --> $DIR/closure-type-error-during-const-eval-66706.rs:20:26 | LL | [0; match [|f @ &ref _| () ] {} ] | ----- ^ expected identifier, found reserved identifier @@ -29,13 +29,13 @@ LL | [0; match [|f @ &ref _| () ] {} ] | while parsing this `match` expression error[E0282]: type annotations needed - --> $DIR/issue-66706.rs:2:14 + --> $DIR/closure-type-error-during-const-eval-66706.rs:3:14 | LL | [0; [|_: _ &_| ()].len()] | ^ cannot infer type error[E0282]: type annotations needed - --> $DIR/issue-66706.rs:13:11 + --> $DIR/closure-type-error-during-const-eval-66706.rs:14:11 | LL | [0; [|&_: _ &_| {}; 0 ].len()] | ^^^^^ cannot infer type diff --git a/tests/ui/issues/issue-76191.rs b/tests/ui/consts/const-range-matching-76191.rs similarity index 89% rename from tests/ui/issues/issue-76191.rs rename to tests/ui/consts/const-range-matching-76191.rs index d2de44380c372..b579a4b3258a7 100644 --- a/tests/ui/issues/issue-76191.rs +++ b/tests/ui/consts/const-range-matching-76191.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/76191 // Regression test for diagnostic issue #76191 #![allow(non_snake_case)] diff --git a/tests/ui/issues/issue-76191.stderr b/tests/ui/consts/const-range-matching-76191.stderr similarity index 92% rename from tests/ui/issues/issue-76191.stderr rename to tests/ui/consts/const-range-matching-76191.stderr index d8b54be88f4bf..5c358d0fa1cf5 100644 --- a/tests/ui/issues/issue-76191.stderr +++ b/tests/ui/consts/const-range-matching-76191.stderr @@ -1,11 +1,11 @@ error[E0080]: evaluation panicked: explicit panic - --> $DIR/issue-76191.rs:8:37 + --> $DIR/const-range-matching-76191.rs:9:37 | LL | const RANGE2: RangeInclusive = panic!(); | ^^^^^^^^ evaluation of `RANGE2` failed here error[E0308]: mismatched types - --> $DIR/issue-76191.rs:14:9 + --> $DIR/const-range-matching-76191.rs:15:9 | LL | const RANGE: RangeInclusive = 0..=255; | -------------------------------- constant defined here @@ -27,7 +27,7 @@ LL + 0..=255 => {} | error[E0308]: mismatched types - --> $DIR/issue-76191.rs:16:9 + --> $DIR/const-range-matching-76191.rs:17:9 | LL | const RANGE2: RangeInclusive = panic!(); | --------------------------------- constant defined here diff --git a/tests/ui/issues/issue-57781.rs b/tests/ui/consts/oncecell-const-init-57781.rs similarity index 86% rename from tests/ui/issues/issue-57781.rs rename to tests/ui/consts/oncecell-const-init-57781.rs index 7f0d2eda9bb84..27426ef25494e 100644 --- a/tests/ui/issues/issue-57781.rs +++ b/tests/ui/consts/oncecell-const-init-57781.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57781 //@ run-pass use std::cell::UnsafeCell; diff --git a/tests/ui/issues/auxiliary/issue-7178.rs b/tests/ui/cross-crate/auxiliary/aux-7178.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-7178.rs rename to tests/ui/cross-crate/auxiliary/aux-7178.rs diff --git a/tests/ui/issues/auxiliary/issue-7899.rs b/tests/ui/cross-crate/auxiliary/aux-7899.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-7899.rs rename to tests/ui/cross-crate/auxiliary/aux-7899.rs diff --git a/tests/ui/issues/auxiliary/issue-8259.rs b/tests/ui/cross-crate/auxiliary/aux-8259.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-8259.rs rename to tests/ui/cross-crate/auxiliary/aux-8259.rs diff --git a/tests/ui/cross-crate/static-method-returning-self-with-generics-7178.rs b/tests/ui/cross-crate/static-method-returning-self-with-generics-7178.rs new file mode 100644 index 0000000000000..3888d3bdaa9de --- /dev/null +++ b/tests/ui/cross-crate/static-method-returning-self-with-generics-7178.rs @@ -0,0 +1,9 @@ +// https://github.com/rust-lang/rust/issues/7178 +//@ run-pass +//@ aux-build:aux-7178.rs + +extern crate aux_7178 as cross_crate_self; + +pub fn main() { + let _ = cross_crate_self::Foo::new(&1); +} diff --git a/tests/ui/issues/issue-8259.rs b/tests/ui/cross-crate/static-with-cross-crate-regions-8259.rs similarity index 55% rename from tests/ui/issues/issue-8259.rs rename to tests/ui/cross-crate/static-with-cross-crate-regions-8259.rs index e843f7f9c5083..347cfa2aee130 100644 --- a/tests/ui/issues/issue-8259.rs +++ b/tests/ui/cross-crate/static-with-cross-crate-regions-8259.rs @@ -1,11 +1,11 @@ +// https://github.com/rust-lang/rust/issues/8259 //@ run-pass #![allow(dead_code)] #![allow(non_upper_case_globals)] -//@ aux-build:issue-8259.rs +//@ aux-build:aux-8259.rs - -extern crate issue_8259 as other; +extern crate aux_8259 as other; static a: other::Foo<'static> = other::Foo::A; pub fn main() {} diff --git a/tests/ui/cross-crate/tuple-struct-cross-crate-7899.rs b/tests/ui/cross-crate/tuple-struct-cross-crate-7899.rs new file mode 100644 index 0000000000000..ce3ea7dd5796a --- /dev/null +++ b/tests/ui/cross-crate/tuple-struct-cross-crate-7899.rs @@ -0,0 +1,10 @@ +// https://github.com/rust-lang/rust/issues/7899 +//@ run-pass +#![allow(unused_variables)] +//@ aux-build:aux-7899.rs + +extern crate aux_7899 as testcrate; + +fn main() { + let f = testcrate::V2(1.0f32, 2.0f32); +} diff --git a/tests/ui/issues/issue-66667-function-cmp-cycle.rs b/tests/ui/cycle-trait/cycle-error-comparing-function-inside-itself-66667-.rs similarity index 88% rename from tests/ui/issues/issue-66667-function-cmp-cycle.rs rename to tests/ui/cycle-trait/cycle-error-comparing-function-inside-itself-66667-.rs index b4f09fbbb04d0..bf85d3b58ce2a 100644 --- a/tests/ui/issues/issue-66667-function-cmp-cycle.rs +++ b/tests/ui/cycle-trait/cycle-error-comparing-function-inside-itself-66667-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/66667- fn first() { second == 1 //~ ERROR binary operation //~^ ERROR mismatched types diff --git a/tests/ui/issues/issue-66667-function-cmp-cycle.stderr b/tests/ui/cycle-trait/cycle-error-comparing-function-inside-itself-66667-.stderr similarity index 73% rename from tests/ui/issues/issue-66667-function-cmp-cycle.stderr rename to tests/ui/cycle-trait/cycle-error-comparing-function-inside-itself-66667-.stderr index cec8117702a9b..de24197ba68d6 100644 --- a/tests/ui/issues/issue-66667-function-cmp-cycle.stderr +++ b/tests/ui/cycle-trait/cycle-error-comparing-function-inside-itself-66667-.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `==` cannot be applied to type `fn() {second}` - --> $DIR/issue-66667-function-cmp-cycle.rs:2:12 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:3:12 | LL | second == 1 | ------ ^^ - {integer} @@ -7,7 +7,7 @@ LL | second == 1 | fn() {second} error[E0308]: mismatched types - --> $DIR/issue-66667-function-cmp-cycle.rs:2:15 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:3:15 | LL | second == 1 | ^ expected fn item, found integer @@ -16,7 +16,7 @@ LL | second == 1 found type `{integer}` error[E0308]: mismatched types - --> $DIR/issue-66667-function-cmp-cycle.rs:2:5 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:3:5 | LL | fn first() { | - help: try adding a return type: `-> bool` @@ -24,7 +24,7 @@ LL | second == 1 | ^^^^^^^^^^^ expected `()`, found `bool` error[E0369]: binary operation `==` cannot be applied to type `fn() {first}` - --> $DIR/issue-66667-function-cmp-cycle.rs:8:11 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:9:11 | LL | first == 1 | ----- ^^ - {integer} @@ -32,7 +32,7 @@ LL | first == 1 | fn() {first} error[E0308]: mismatched types - --> $DIR/issue-66667-function-cmp-cycle.rs:8:14 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:9:14 | LL | first == 1 | ^ expected fn item, found integer @@ -41,7 +41,7 @@ LL | first == 1 found type `{integer}` error[E0308]: mismatched types - --> $DIR/issue-66667-function-cmp-cycle.rs:8:5 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:9:5 | LL | fn second() { | - help: try adding a return type: `-> bool` @@ -49,7 +49,7 @@ LL | first == 1 | ^^^^^^^^^^ expected `()`, found `bool` error[E0369]: binary operation `==` cannot be applied to type `fn() {bar}` - --> $DIR/issue-66667-function-cmp-cycle.rs:14:9 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:15:9 | LL | bar == 1 | --- ^^ - {integer} @@ -57,7 +57,7 @@ LL | bar == 1 | fn() {bar} error[E0308]: mismatched types - --> $DIR/issue-66667-function-cmp-cycle.rs:14:12 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:15:12 | LL | bar == 1 | ^ expected fn item, found integer @@ -66,7 +66,7 @@ LL | bar == 1 found type `{integer}` error[E0308]: mismatched types - --> $DIR/issue-66667-function-cmp-cycle.rs:14:5 + --> $DIR/cycle-error-comparing-function-inside-itself-66667-.rs:15:5 | LL | fn bar() { | - help: try adding a return type: `-> bool` diff --git a/tests/ui/issues/issue-58463.rs b/tests/ui/debuginfo/impl-copy-function-debuginfo-58463.rs similarity index 67% rename from tests/ui/issues/issue-58463.rs rename to tests/ui/debuginfo/impl-copy-function-debuginfo-58463.rs index 6e4b909bc3835..72388c36ce487 100644 --- a/tests/ui/issues/issue-58463.rs +++ b/tests/ui/debuginfo/impl-copy-function-debuginfo-58463.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/58463 //@ run-pass //@ compile-flags:-C debuginfo=2 diff --git a/tests/ui/issues/issue-58734.rs b/tests/ui/dyn-compatibility/spurious-object-safety-errors-58734.rs similarity index 91% rename from tests/ui/issues/issue-58734.rs rename to tests/ui/dyn-compatibility/spurious-object-safety-errors-58734.rs index e5b371f5530dc..3e9ebb497a21b 100644 --- a/tests/ui/issues/issue-58734.rs +++ b/tests/ui/dyn-compatibility/spurious-object-safety-errors-58734.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/58734 trait Trait { fn exists(self) -> (); diff --git a/tests/ui/issues/issue-58734.stderr b/tests/ui/dyn-compatibility/spurious-object-safety-errors-58734.stderr similarity index 91% rename from tests/ui/issues/issue-58734.stderr rename to tests/ui/dyn-compatibility/spurious-object-safety-errors-58734.stderr index c246d1fc11119..e2d7f79d9089e 100644 --- a/tests/ui/issues/issue-58734.stderr +++ b/tests/ui/dyn-compatibility/spurious-object-safety-errors-58734.stderr @@ -1,5 +1,5 @@ warning: trait objects without an explicit `dyn` are deprecated - --> $DIR/issue-58734.rs:20:5 + --> $DIR/spurious-object-safety-errors-58734.rs:21:5 | LL | Trait::nonexistent(()); | ^^^^^ @@ -13,14 +13,14 @@ LL | ::nonexistent(()); | ++++ + error[E0038]: the trait `Trait` is not dyn compatible - --> $DIR/issue-58734.rs:20:5 + --> $DIR/spurious-object-safety-errors-58734.rs:21:5 | LL | Trait::nonexistent(()); | ^^^^^ `Trait` is not dyn compatible | note: for a trait to be dyn compatible it needs to allow building a vtable for more information, visit - --> $DIR/issue-58734.rs:4:8 + --> $DIR/spurious-object-safety-errors-58734.rs:5:8 | LL | trait Trait { | ----- this trait is not dyn compatible... diff --git a/tests/ui/issues/issue-53419.rs b/tests/ui/dyn-keyword/dyn-trait-function-pointer-53419.rs similarity index 65% rename from tests/ui/issues/issue-53419.rs rename to tests/ui/dyn-keyword/dyn-trait-function-pointer-53419.rs index 55d41f2005d29..b1017b104ac24 100644 --- a/tests/ui/issues/issue-53419.rs +++ b/tests/ui/dyn-keyword/dyn-trait-function-pointer-53419.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/53419 //@ check-pass struct Foo { diff --git a/tests/ui/issues/issue-8761.rs b/tests/ui/enum/enum-discriminant-type-mismatch-8761.rs similarity index 80% rename from tests/ui/issues/issue-8761.rs rename to tests/ui/enum/enum-discriminant-type-mismatch-8761.rs index 5883bb9669562..ae09b919dc152 100644 --- a/tests/ui/issues/issue-8761.rs +++ b/tests/ui/enum/enum-discriminant-type-mismatch-8761.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8761 enum Foo { A = 1i64, //~^ ERROR mismatched types diff --git a/tests/ui/issues/issue-8761.stderr b/tests/ui/enum/enum-discriminant-type-mismatch-8761.stderr similarity index 83% rename from tests/ui/issues/issue-8761.stderr rename to tests/ui/enum/enum-discriminant-type-mismatch-8761.stderr index 4a9db56891386..f1645183e176b 100644 --- a/tests/ui/issues/issue-8761.stderr +++ b/tests/ui/enum/enum-discriminant-type-mismatch-8761.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-8761.rs:2:9 + --> $DIR/enum-discriminant-type-mismatch-8761.rs:3:9 | LL | A = 1i64, | ^^^^ expected `isize`, found `i64` @@ -11,7 +11,7 @@ LL + A = 1isize, | error[E0308]: mismatched types - --> $DIR/issue-8761.rs:5:9 + --> $DIR/enum-discriminant-type-mismatch-8761.rs:6:9 | LL | B = 2u8 | ^^^ expected `isize`, found `u8` diff --git a/tests/ui/issues/issue-5900.rs b/tests/ui/enum/enum-referred-by-submodule-5900.rs similarity index 77% rename from tests/ui/issues/issue-5900.rs rename to tests/ui/enum/enum-referred-by-submodule-5900.rs index 14b7b8f815a01..4ed092670a86a 100644 --- a/tests/ui/issues/issue-5900.rs +++ b/tests/ui/enum/enum-referred-by-submodule-5900.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5900 //@ check-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-80607.rs b/tests/ui/enum/enum-variant-field-error-80607.rs similarity index 82% rename from tests/ui/issues/issue-80607.rs rename to tests/ui/enum/enum-variant-field-error-80607.rs index 63f4df359b831..aa3f2f7c526f6 100644 --- a/tests/ui/issues/issue-80607.rs +++ b/tests/ui/enum/enum-variant-field-error-80607.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/80607 // This tests makes sure the diagnostics print the offending enum variant, not just the type. pub enum Enum { V1(i32), diff --git a/tests/ui/issues/issue-80607.stderr b/tests/ui/enum/enum-variant-field-error-80607.stderr similarity index 89% rename from tests/ui/issues/issue-80607.stderr rename to tests/ui/enum/enum-variant-field-error-80607.stderr index 8f9f494c8b7a4..8d088ef04bbbf 100644 --- a/tests/ui/issues/issue-80607.stderr +++ b/tests/ui/enum/enum-variant-field-error-80607.stderr @@ -1,5 +1,5 @@ error[E0559]: variant `Enum::V1` has no field named `x` - --> $DIR/issue-80607.rs:7:16 + --> $DIR/enum-variant-field-error-80607.rs:8:16 | LL | V1(i32), | -- `Enum::V1` defined here diff --git a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997.rs b/tests/ui/enum/enum-with-generic-parameter-5997.rs similarity index 77% rename from tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997.rs rename to tests/ui/enum/enum-with-generic-parameter-5997.rs index 7ed8819f3220a..fab7ebbbbdc85 100644 --- a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997.rs +++ b/tests/ui/enum/enum-with-generic-parameter-5997.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5997 //@ run-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-6117.rs b/tests/ui/enum/match-either-enum-variants-6117.rs similarity index 79% rename from tests/ui/issues/issue-6117.rs rename to tests/ui/enum/match-either-enum-variants-6117.rs index 3ccf67b031991..7b395066166b7 100644 --- a/tests/ui/issues/issue-6117.rs +++ b/tests/ui/enum/match-either-enum-variants-6117.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/6117 //@ run-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-8506.rs b/tests/ui/enum/simple-enum-usage-8506.rs similarity index 78% rename from tests/ui/issues/issue-8506.rs rename to tests/ui/enum/simple-enum-usage-8506.rs index 30a789a3e27bf..ebe095d84e437 100644 --- a/tests/ui/issues/issue-8506.rs +++ b/tests/ui/enum/simple-enum-usage-8506.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8506 //@ run-pass #![allow(non_upper_case_globals)] diff --git a/tests/ui/issues/issue-59756.fixed b/tests/ui/error-emitter/incompatible-types-in-try-expression-59756.fixed similarity index 100% rename from tests/ui/issues/issue-59756.fixed rename to tests/ui/error-emitter/incompatible-types-in-try-expression-59756.fixed diff --git a/tests/ui/issues/issue-59756.rs b/tests/ui/error-emitter/incompatible-types-in-try-expression-59756.rs similarity index 89% rename from tests/ui/issues/issue-59756.rs rename to tests/ui/error-emitter/incompatible-types-in-try-expression-59756.rs index de349f43f464b..570aa7d373b7c 100644 --- a/tests/ui/issues/issue-59756.rs +++ b/tests/ui/error-emitter/incompatible-types-in-try-expression-59756.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/59756 //@ run-rustfix //@ ignore-test (rustfix needs multiple suggestions) // diff --git a/tests/ui/issues/issue-59756.stderr b/tests/ui/error-emitter/incompatible-types-in-try-expression-59756.stderr similarity index 88% rename from tests/ui/issues/issue-59756.stderr rename to tests/ui/error-emitter/incompatible-types-in-try-expression-59756.stderr index 27c07fecd5b50..7182109b5a02d 100644 --- a/tests/ui/issues/issue-59756.stderr +++ b/tests/ui/error-emitter/incompatible-types-in-try-expression-59756.stderr @@ -1,5 +1,5 @@ error[E0308]: try expression alternatives have incompatible types - --> $DIR/issue-59756.rs:13:5 + --> $DIR/incompatible-types-in-try-expression-59756.rs:13:5 | LL | foo()? | ^^^^^^ expected enum `std::result::Result`, found struct `A` diff --git a/tests/ui/issues/issue-75283.rs b/tests/ui/extern/function-definition-in-extern-block-75283.rs similarity index 70% rename from tests/ui/issues/issue-75283.rs rename to tests/ui/extern/function-definition-in-extern-block-75283.rs index d556132e47ffd..e2b7358743ba1 100644 --- a/tests/ui/issues/issue-75283.rs +++ b/tests/ui/extern/function-definition-in-extern-block-75283.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/75283 extern "C" { fn lol() { //~ ERROR incorrect function inside `extern` block println!(""); diff --git a/tests/ui/issues/issue-75283.stderr b/tests/ui/extern/function-definition-in-extern-block-75283.stderr similarity index 91% rename from tests/ui/issues/issue-75283.stderr rename to tests/ui/extern/function-definition-in-extern-block-75283.stderr index 240d9716a5561..67be1c2959922 100644 --- a/tests/ui/issues/issue-75283.stderr +++ b/tests/ui/extern/function-definition-in-extern-block-75283.stderr @@ -1,5 +1,5 @@ error: incorrect function inside `extern` block - --> $DIR/issue-75283.rs:2:8 + --> $DIR/function-definition-in-extern-block-75283.rs:3:8 | LL | extern "C" { | ---------- `extern` blocks define existing foreign functions and functions inside of them cannot have a body diff --git a/tests/ui/issues/issue-54410.rs b/tests/ui/ffi/extern-static-mut-slicers-54410.rs similarity index 79% rename from tests/ui/issues/issue-54410.rs rename to tests/ui/ffi/extern-static-mut-slicers-54410.rs index e3e8ca985b970..0c967229bde25 100644 --- a/tests/ui/issues/issue-54410.rs +++ b/tests/ui/ffi/extern-static-mut-slicers-54410.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/54410 extern "C" { pub static mut symbol: [i8]; //~^ ERROR the size for values of type `[i8]` cannot be known at compilation time diff --git a/tests/ui/issues/issue-54410.stderr b/tests/ui/ffi/extern-static-mut-slicers-54410.stderr similarity index 89% rename from tests/ui/issues/issue-54410.stderr rename to tests/ui/ffi/extern-static-mut-slicers-54410.stderr index cb68ada7e1354..7d0dae69ec8f1 100644 --- a/tests/ui/issues/issue-54410.stderr +++ b/tests/ui/ffi/extern-static-mut-slicers-54410.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[i8]` cannot be known at compilation time - --> $DIR/issue-54410.rs:2:5 + --> $DIR/extern-static-mut-slicers-54410.rs:3:5 | LL | pub static mut symbol: [i8]; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/tests/ui/issues/issue-70381.rs b/tests/ui/fmt/unicode-format-string-missing-parameter-70381.rs similarity index 67% rename from tests/ui/issues/issue-70381.rs rename to tests/ui/fmt/unicode-format-string-missing-parameter-70381.rs index 3df8277b87372..f8106580e141a 100644 --- a/tests/ui/issues/issue-70381.rs +++ b/tests/ui/fmt/unicode-format-string-missing-parameter-70381.rs @@ -1,6 +1,7 @@ +// https://github.com/rust-lang/rust/issues/70381 // Test that multi-byte unicode characters with missing parameters do not ICE. fn main() { - println!("\rยก{}") + println!("ยก{}") //~^ ERROR 1 positional argument in format string } diff --git a/tests/ui/issues/issue-70381.stderr b/tests/ui/fmt/unicode-format-string-missing-parameter-70381.stderr similarity index 52% rename from tests/ui/issues/issue-70381.stderr rename to tests/ui/fmt/unicode-format-string-missing-parameter-70381.stderr index 298a1cf9e0d5f..abbfc09d36655 100644 --- a/tests/ui/issues/issue-70381.stderr +++ b/tests/ui/fmt/unicode-format-string-missing-parameter-70381.stderr @@ -1,8 +1,8 @@ error: 1 positional argument in format string, but no arguments were given - --> $DIR/issue-70381.rs:4:16 + --> $DIR/unicode-format-string-missing-parameter-70381.rs:5:14 | -LL | println!("\rยก{}") - | ^^ +LL | println!("ยก{}") + | ^^ error: aborting due to 1 previous error diff --git a/tests/ui/issues/issue-64593.rs b/tests/ui/foreign/extern-rust-ffi-warning-64593.rs similarity index 80% rename from tests/ui/issues/issue-64593.rs rename to tests/ui/foreign/extern-rust-ffi-warning-64593.rs index e28b9577347be..d4b35bde92abb 100644 --- a/tests/ui/issues/issue-64593.rs +++ b/tests/ui/foreign/extern-rust-ffi-warning-64593.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/64593 //@ check-pass #![deny(improper_ctypes)] diff --git a/tests/ui/issues/issue-54696.rs b/tests/ui/function-pointer/function-pointer-comparison-54696.rs similarity index 82% rename from tests/ui/issues/issue-54696.rs rename to tests/ui/function-pointer/function-pointer-comparison-54696.rs index 63ffbe42bcc9f..2e28dfeaaf884 100644 --- a/tests/ui/issues/issue-54696.rs +++ b/tests/ui/function-pointer/function-pointer-comparison-54696.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/54696 //@ run-pass #![allow(unpredictable_function_pointer_comparisons)] diff --git a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-struct.rs b/tests/ui/generics/enum-definition-with-enclosing-generic-5997-.rs similarity index 76% rename from tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-struct.rs rename to tests/ui/generics/enum-definition-with-enclosing-generic-5997-.rs index 19d994b0dfb7a..c55d0439ab87f 100644 --- a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-struct.rs +++ b/tests/ui/generics/enum-definition-with-enclosing-generic-5997-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5997- fn f() -> bool { struct S(T); //~ ERROR can't use generic parameters from outer item diff --git a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-struct.stderr b/tests/ui/generics/enum-definition-with-enclosing-generic-5997-.stderr similarity index 86% rename from tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-struct.stderr rename to tests/ui/generics/enum-definition-with-enclosing-generic-5997-.stderr index 670a54894b5c6..d1f4266f03abf 100644 --- a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-struct.stderr +++ b/tests/ui/generics/enum-definition-with-enclosing-generic-5997-.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use generic parameters from outer item - --> $DIR/issue-5997-struct.rs:2:14 + --> $DIR/enum-definition-with-enclosing-generic-5997-.rs:3:14 | LL | fn f() -> bool { | - type parameter from outer item diff --git a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-enum.rs b/tests/ui/generics/enum-definition-with-outer-generic-parameter-5997-.rs similarity index 77% rename from tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-enum.rs rename to tests/ui/generics/enum-definition-with-outer-generic-parameter-5997-.rs index 0b1857ae3df30..a4ef0f60c9f64 100644 --- a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-enum.rs +++ b/tests/ui/generics/enum-definition-with-outer-generic-parameter-5997-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5997- fn f() -> bool { enum E { V(Z) } //~^ ERROR can't use generic parameters from outer item diff --git a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-enum.stderr b/tests/ui/generics/enum-definition-with-outer-generic-parameter-5997-.stderr similarity index 85% rename from tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-enum.stderr rename to tests/ui/generics/enum-definition-with-outer-generic-parameter-5997-.stderr index c0b3cd6de66d7..04dd8866ef5f6 100644 --- a/tests/ui/issues/issue-5997-outer-generic-parameter/issue-5997-enum.stderr +++ b/tests/ui/generics/enum-definition-with-outer-generic-parameter-5997-.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use generic parameters from outer item - --> $DIR/issue-5997-enum.rs:2:16 + --> $DIR/enum-definition-with-outer-generic-parameter-5997-.rs:3:16 | LL | fn f() -> bool { | - type parameter from outer item diff --git a/tests/ui/issues/issue-56237.rs b/tests/ui/generics/generic-associated-type-deref-target-56237.rs similarity index 77% rename from tests/ui/issues/issue-56237.rs rename to tests/ui/generics/generic-associated-type-deref-target-56237.rs index 3c0a235f3ec2c..2050ca377e8c1 100644 --- a/tests/ui/issues/issue-56237.rs +++ b/tests/ui/generics/generic-associated-type-deref-target-56237.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/56237 //@ run-pass use std::ops::Deref; diff --git a/tests/ui/issues/issue-69306.rs b/tests/ui/generics/generic-struct-self-behavior-69306.rs similarity index 93% rename from tests/ui/issues/issue-69306.rs rename to tests/ui/generics/generic-struct-self-behavior-69306.rs index 85d60952ac823..b8e7dff95a591 100644 --- a/tests/ui/issues/issue-69306.rs +++ b/tests/ui/generics/generic-struct-self-behavior-69306.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/69306 fn main() {} struct S0(T); diff --git a/tests/ui/issues/issue-69306.stderr b/tests/ui/generics/generic-struct-self-behavior-69306.stderr similarity index 84% rename from tests/ui/issues/issue-69306.stderr rename to tests/ui/generics/generic-struct-self-behavior-69306.stderr index 6fc5c33af6acd..7fe5ebe74b7c0 100644 --- a/tests/ui/issues/issue-69306.stderr +++ b/tests/ui/generics/generic-struct-self-behavior-69306.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-69306.rs:5:28 + --> $DIR/generic-struct-self-behavior-69306.rs:6:28 | LL | impl S0 { | - expected this type parameter @@ -11,13 +11,13 @@ LL | const C: S0 = Self(0); = note: expected type parameter `T` found type `{integer}` note: tuple struct defined here - --> $DIR/issue-69306.rs:3:8 + --> $DIR/generic-struct-self-behavior-69306.rs:4:8 | LL | struct S0(T); | ^^ error[E0308]: mismatched types - --> $DIR/issue-69306.rs:5:23 + --> $DIR/generic-struct-self-behavior-69306.rs:6:23 | LL | impl S0 { | - found this type parameter @@ -28,7 +28,7 @@ LL | const C: S0 = Self(0); found struct `S0` error[E0308]: mismatched types - --> $DIR/issue-69306.rs:10:14 + --> $DIR/generic-struct-self-behavior-69306.rs:11:14 | LL | impl S0 { | - expected this type parameter @@ -41,13 +41,13 @@ LL | Self(0); = note: expected type parameter `T` found type `{integer}` note: tuple struct defined here - --> $DIR/issue-69306.rs:3:8 + --> $DIR/generic-struct-self-behavior-69306.rs:4:8 | LL | struct S0(T); | ^^ error[E0308]: mismatched types - --> $DIR/issue-69306.rs:27:14 + --> $DIR/generic-struct-self-behavior-69306.rs:28:14 | LL | impl Foo for as Fun>::Out { | - expected this type parameter @@ -60,13 +60,13 @@ LL | Self(0); = note: expected type parameter `T` found type `{integer}` note: tuple struct defined here - --> $DIR/issue-69306.rs:3:8 + --> $DIR/generic-struct-self-behavior-69306.rs:4:8 | LL | struct S0(T); | ^^ error[E0308]: mismatched types - --> $DIR/issue-69306.rs:33:32 + --> $DIR/generic-struct-self-behavior-69306.rs:34:32 | LL | impl S1 { | - expected this type parameter @@ -78,13 +78,13 @@ LL | const C: S1 = Self(0, 1); = note: expected type parameter `T` found type `{integer}` note: tuple struct defined here - --> $DIR/issue-69306.rs:31:8 + --> $DIR/generic-struct-self-behavior-69306.rs:32:8 | LL | struct S1(T, U); | ^^ error[E0308]: mismatched types - --> $DIR/issue-69306.rs:33:27 + --> $DIR/generic-struct-self-behavior-69306.rs:34:27 | LL | impl S1 { | - found this type parameter @@ -95,7 +95,7 @@ LL | const C: S1 = Self(0, 1); found struct `S1` error[E0308]: mismatched types - --> $DIR/issue-69306.rs:41:14 + --> $DIR/generic-struct-self-behavior-69306.rs:42:14 | LL | impl S2 { | - expected type parameter @@ -111,13 +111,13 @@ LL | Self(x) = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters note: tuple struct defined here - --> $DIR/issue-69306.rs:38:8 + --> $DIR/generic-struct-self-behavior-69306.rs:39:8 | LL | struct S2(T); | ^^ error[E0308]: mismatched types - --> $DIR/issue-69306.rs:41:9 + --> $DIR/generic-struct-self-behavior-69306.rs:42:9 | LL | impl S2 { | - found type parameter diff --git a/tests/ui/issues/issue-60218.rs b/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs similarity index 89% rename from tests/ui/issues/issue-60218.rs rename to tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs index 4926691f3b568..d1a4e09243ecf 100644 --- a/tests/ui/issues/issue-60218.rs +++ b/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/60218 // Regression test for #60218 // // This was reported to cause ICEs. diff --git a/tests/ui/issues/issue-60218.stderr b/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr similarity index 85% rename from tests/ui/issues/issue-60218.stderr rename to tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr index b9317621b77ac..4c403bcbd601f 100644 --- a/tests/ui/issues/issue-60218.stderr +++ b/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `&u32: Foo` is not satisfied - --> $DIR/issue-60218.rs:18:19 + --> $DIR/higher-trait-bounds-ice-60218.rs:19:19 | LL | trigger_error(vec![], |x: &u32| x) | ------------- ^^^^^^ the trait `Foo` is not implemented for `&u32` @@ -7,12 +7,12 @@ LL | trigger_error(vec![], |x: &u32| x) | required by a bound introduced by this call | help: this trait has no implementations, consider adding one - --> $DIR/issue-60218.rs:7:1 + --> $DIR/higher-trait-bounds-ice-60218.rs:8:1 | LL | pub trait Foo {} | ^^^^^^^^^^^^^ note: required by a bound in `trigger_error` - --> $DIR/issue-60218.rs:13:72 + --> $DIR/higher-trait-bounds-ice-60218.rs:14:72 | LL | pub fn trigger_error(iterable: I, functor: F) | ------------- required by a bound in this function diff --git a/tests/ui/issues/issue-55731.rs b/tests/ui/higher-ranked/hrtb-associated-type-leak-check-55731.rs similarity index 95% rename from tests/ui/issues/issue-55731.rs rename to tests/ui/higher-ranked/hrtb-associated-type-leak-check-55731.rs index 7b4f4e2cd3b40..978abd9fcf5a3 100644 --- a/tests/ui/issues/issue-55731.rs +++ b/tests/ui/higher-ranked/hrtb-associated-type-leak-check-55731.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/55731 use std::marker::PhantomData; trait DistributedIterator { diff --git a/tests/ui/issues/issue-55731.stderr b/tests/ui/higher-ranked/hrtb-associated-type-leak-check-55731.stderr similarity index 90% rename from tests/ui/issues/issue-55731.stderr rename to tests/ui/higher-ranked/hrtb-associated-type-leak-check-55731.stderr index 2c38041642d33..40ac1d9d041be 100644 --- a/tests/ui/issues/issue-55731.stderr +++ b/tests/ui/higher-ranked/hrtb-associated-type-leak-check-55731.stderr @@ -1,5 +1,5 @@ error: implementation of `DistributedIteratorMulti` is not general enough - --> $DIR/issue-55731.rs:48:5 + --> $DIR/hrtb-associated-type-leak-check-55731.rs:49:5 | LL | / multi(Map { LL | | i: Cloned(PhantomData), diff --git a/tests/ui/issues/auxiliary/reexported-trait.rs b/tests/ui/imports/auxiliary/reexported-trait.rs similarity index 100% rename from tests/ui/issues/auxiliary/reexported-trait.rs rename to tests/ui/imports/auxiliary/reexported-trait.rs diff --git a/tests/ui/issues/issue-56175.rs b/tests/ui/imports/private-types-suggested-without-extern-crate-56175.rs similarity index 80% rename from tests/ui/issues/issue-56175.rs rename to tests/ui/imports/private-types-suggested-without-extern-crate-56175.rs index daffe806a900c..a0628fb63b76d 100644 --- a/tests/ui/issues/issue-56175.rs +++ b/tests/ui/imports/private-types-suggested-without-extern-crate-56175.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/56175 //@ edition:2018 //@ aux-crate:reexported_trait=reexported-trait.rs diff --git a/tests/ui/issues/issue-56175.stderr b/tests/ui/imports/private-types-suggested-without-extern-crate-56175.stderr similarity index 92% rename from tests/ui/issues/issue-56175.stderr rename to tests/ui/imports/private-types-suggested-without-extern-crate-56175.stderr index df4cd6ce8a700..d421cf5d1e8b6 100644 --- a/tests/ui/issues/issue-56175.stderr +++ b/tests/ui/imports/private-types-suggested-without-extern-crate-56175.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `trait_method` found for struct `FooStruct` in the current scope - --> $DIR/issue-56175.rs:5:33 + --> $DIR/private-types-suggested-without-extern-crate-56175.rs:6:33 | LL | reexported_trait::FooStruct.trait_method(); | ^^^^^^^^^^^^ @@ -20,7 +20,7 @@ LL | reexported_trait::FooStruct.trait_method_b(); | ++ error[E0599]: no method named `trait_method_b` found for struct `FooStruct` in the current scope - --> $DIR/issue-56175.rs:7:33 + --> $DIR/private-types-suggested-without-extern-crate-56175.rs:8:33 | LL | reexported_trait::FooStruct.trait_method_b(); | ^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/auxiliary/issue-57271-lib.rs b/tests/ui/infinite/auxiliary/aux-57271-lib.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-57271-lib.rs rename to tests/ui/infinite/auxiliary/aux-57271-lib.rs diff --git a/tests/ui/issues/issue-57271.rs b/tests/ui/infinite/mutually-recursive-infinite-types-57271.rs similarity index 72% rename from tests/ui/issues/issue-57271.rs rename to tests/ui/infinite/mutually-recursive-infinite-types-57271.rs index 20d081ecb3ce6..cb20770b48690 100644 --- a/tests/ui/issues/issue-57271.rs +++ b/tests/ui/infinite/mutually-recursive-infinite-types-57271.rs @@ -1,8 +1,9 @@ -//@ aux-build:issue-57271-lib.rs +// https://github.com/rust-lang/rust/issues/57271 +//@ aux-build:aux-57271-lib.rs -extern crate issue_57271_lib; +extern crate aux_57271_lib; -use issue_57271_lib::BaseType; +use aux_57271_lib::BaseType; pub enum ObjectType { //~ ERROR recursive types `ObjectType` and `TypeSignature` have infinite size Class(ClassTypeSignature), diff --git a/tests/ui/issues/issue-57271.stderr b/tests/ui/infinite/mutually-recursive-infinite-types-57271.stderr similarity index 92% rename from tests/ui/issues/issue-57271.stderr rename to tests/ui/infinite/mutually-recursive-infinite-types-57271.stderr index a61419c61d74a..8bf1b470062bd 100644 --- a/tests/ui/issues/issue-57271.stderr +++ b/tests/ui/infinite/mutually-recursive-infinite-types-57271.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive types `ObjectType` and `TypeSignature` have infinite size - --> $DIR/issue-57271.rs:7:1 + --> $DIR/mutually-recursive-infinite-types-57271.rs:8:1 | LL | pub enum ObjectType { | ^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-85461.rs b/tests/ui/instrument-coverage/msvc-link-dead-code-inline-always-85461.rs similarity index 91% rename from tests/ui/issues/issue-85461.rs rename to tests/ui/instrument-coverage/msvc-link-dead-code-inline-always-85461.rs index 72538081ccb3a..ffb535e69ee56 100644 --- a/tests/ui/issues/issue-85461.rs +++ b/tests/ui/instrument-coverage/msvc-link-dead-code-inline-always-85461.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/85461 //@ compile-flags: -Cinstrument-coverage -Ccodegen-units=4 --crate-type dylib -Copt-level=0 //@ build-pass //@ needs-profiler-runtime diff --git a/tests/ui/issues/issue-5518.rs b/tests/ui/issues/issue-5518.rs deleted file mode 100644 index 333185c482fe4..0000000000000 --- a/tests/ui/issues/issue-5518.rs +++ /dev/null @@ -1,7 +0,0 @@ -//@ run-pass -//@ aux-build:issue-5518.rs - - -extern crate issue_5518 as other; - -fn main() {} diff --git a/tests/ui/issues/issue-56943.rs b/tests/ui/issues/issue-56943.rs deleted file mode 100644 index 9664567ec9ea0..0000000000000 --- a/tests/ui/issues/issue-56943.rs +++ /dev/null @@ -1,8 +0,0 @@ -//@ aux-build:issue-56943.rs - -extern crate issue_56943; - -fn main() { - let _: issue_56943::S = issue_56943::S2; - //~^ ERROR mismatched types [E0308] -} diff --git a/tests/ui/issues/issue-5844.rs b/tests/ui/issues/issue-5844.rs deleted file mode 100644 index 23021207ae195..0000000000000 --- a/tests/ui/issues/issue-5844.rs +++ /dev/null @@ -1,7 +0,0 @@ -//@aux-build:issue-5844-aux.rs - -extern crate issue_5844_aux; - -fn main() { - issue_5844_aux::rand(); //~ ERROR: requires unsafe -} diff --git a/tests/ui/issues/issue-6344-match.rs b/tests/ui/issues/issue-6344-match.rs deleted file mode 100644 index 9251e274383da..0000000000000 --- a/tests/ui/issues/issue-6344-match.rs +++ /dev/null @@ -1,18 +0,0 @@ -//@ run-pass -#![allow(non_shorthand_field_patterns)] - -struct A { x: usize } - -impl Drop for A { - fn drop(&mut self) {} -} - -pub fn main() { - let a = A { x: 0 }; - - match a { - A { x : ref x } => { - println!("{}", x) - } - } -} diff --git a/tests/ui/issues/issue-7178.rs b/tests/ui/issues/issue-7178.rs deleted file mode 100644 index 408ce0b03eb82..0000000000000 --- a/tests/ui/issues/issue-7178.rs +++ /dev/null @@ -1,9 +0,0 @@ -//@ run-pass -//@ aux-build:issue-7178.rs - - -extern crate issue_7178 as cross_crate_self; - -pub fn main() { - let _ = cross_crate_self::Foo::new(&1); -} diff --git a/tests/ui/issues/issue-7899.rs b/tests/ui/issues/issue-7899.rs deleted file mode 100644 index 4b69f3e3d89aa..0000000000000 --- a/tests/ui/issues/issue-7899.rs +++ /dev/null @@ -1,10 +0,0 @@ -//@ run-pass -#![allow(unused_variables)] -//@ aux-build:issue-7899.rs - - -extern crate issue_7899 as testcrate; - -fn main() { - let f = testcrate::V2(1.0f32, 2.0f32); -} diff --git a/tests/ui/issues/issue-8044.rs b/tests/ui/issues/issue-8044.rs deleted file mode 100644 index 3c10bbca6342b..0000000000000 --- a/tests/ui/issues/issue-8044.rs +++ /dev/null @@ -1,10 +0,0 @@ -//@ run-pass -//@ aux-build:issue-8044.rs - - -extern crate issue_8044 as minimal; -use minimal::{BTree, leaf}; - -pub fn main() { - BTree:: { node: leaf(1) }; -} diff --git a/tests/ui/issues/issue-8401.rs b/tests/ui/issues/issue-8401.rs deleted file mode 100644 index 1df63516fb0be..0000000000000 --- a/tests/ui/issues/issue-8401.rs +++ /dev/null @@ -1,7 +0,0 @@ -//@ run-pass -//@ aux-build:issue-8401.rs - - -extern crate issue_8401; - -pub fn main() {} diff --git a/tests/ui/issues/issue-9123.rs b/tests/ui/issues/issue-9123.rs deleted file mode 100644 index bbf6c13341c27..0000000000000 --- a/tests/ui/issues/issue-9123.rs +++ /dev/null @@ -1,7 +0,0 @@ -//@ run-pass -//@ aux-build:issue-9123.rs - - -extern crate issue_9123; - -pub fn main() {} diff --git a/tests/ui/issues/issue-81584.fixed b/tests/ui/iterators/iterator-scope-collect-suggestion-81584.fixed similarity index 84% rename from tests/ui/issues/issue-81584.fixed rename to tests/ui/iterators/iterator-scope-collect-suggestion-81584.fixed index c3d33a1b4f8bc..0e3d48fe27d8a 100644 --- a/tests/ui/issues/issue-81584.fixed +++ b/tests/ui/iterators/iterator-scope-collect-suggestion-81584.fixed @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/81584 //@ run-rustfix fn main() { let _ = vec![vec![0, 1], vec![2]] diff --git a/tests/ui/issues/issue-81584.rs b/tests/ui/iterators/iterator-scope-collect-suggestion-81584.rs similarity index 83% rename from tests/ui/issues/issue-81584.rs rename to tests/ui/iterators/iterator-scope-collect-suggestion-81584.rs index 27db73aaa2c86..3fba39517fcc5 100644 --- a/tests/ui/issues/issue-81584.rs +++ b/tests/ui/iterators/iterator-scope-collect-suggestion-81584.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/81584 //@ run-rustfix fn main() { let _ = vec![vec![0, 1], vec![2]] diff --git a/tests/ui/issues/issue-81584.stderr b/tests/ui/iterators/iterator-scope-collect-suggestion-81584.stderr similarity index 89% rename from tests/ui/issues/issue-81584.stderr rename to tests/ui/iterators/iterator-scope-collect-suggestion-81584.stderr index eb97916ad75ef..e180183e7e387 100644 --- a/tests/ui/issues/issue-81584.stderr +++ b/tests/ui/iterators/iterator-scope-collect-suggestion-81584.stderr @@ -1,5 +1,5 @@ error[E0515]: cannot return value referencing function parameter `y` - --> $DIR/issue-81584.rs:5:22 + --> $DIR/iterator-scope-collect-suggestion-81584.rs:6:22 | LL | .map(|y| y.iter().map(|x| x + 1)) | -^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-57198-pass.rs b/tests/ui/keyword/raw-identifier-for-function-57198-.rs similarity index 60% rename from tests/ui/issues/issue-57198-pass.rs rename to tests/ui/keyword/raw-identifier-for-function-57198-.rs index 06f30603c3169..64a88af5beed5 100644 --- a/tests/ui/issues/issue-57198-pass.rs +++ b/tests/ui/keyword/raw-identifier-for-function-57198-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57198- //@ run-pass mod m { diff --git a/tests/ui/issues/issue-72278.rs b/tests/ui/lifetimes/explicit-lifetime-arguments-warning-72278.rs similarity index 85% rename from tests/ui/issues/issue-72278.rs rename to tests/ui/lifetimes/explicit-lifetime-arguments-warning-72278.rs index 2a9cd9423915f..beeda1c9953b1 100644 --- a/tests/ui/issues/issue-72278.rs +++ b/tests/ui/lifetimes/explicit-lifetime-arguments-warning-72278.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/72278 //@ run-pass #![allow(unused)] diff --git a/tests/ui/issues/issue-72278.stderr b/tests/ui/lifetimes/explicit-lifetime-arguments-warning-72278.stderr similarity index 90% rename from tests/ui/issues/issue-72278.stderr rename to tests/ui/lifetimes/explicit-lifetime-arguments-warning-72278.stderr index 5468837a30591..9e679ccc80d7c 100644 --- a/tests/ui/issues/issue-72278.stderr +++ b/tests/ui/lifetimes/explicit-lifetime-arguments-warning-72278.stderr @@ -1,5 +1,5 @@ warning: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/issue-72278.rs:14:14 + --> $DIR/explicit-lifetime-arguments-warning-72278.rs:15:14 | LL | fn func<'a, U>(&'a self) -> U { | -- the late bound lifetime parameter is introduced here diff --git a/tests/ui/issues/issue-60622.rs b/tests/ui/lifetimes/late-bound-lifetime-parameters-60622.rs similarity index 89% rename from tests/ui/issues/issue-60622.rs rename to tests/ui/lifetimes/late-bound-lifetime-parameters-60622.rs index 7b9443eee5013..d56bc18f669ed 100644 --- a/tests/ui/issues/issue-60622.rs +++ b/tests/ui/lifetimes/late-bound-lifetime-parameters-60622.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/60622 #![deny(warnings)] struct Borked {} diff --git a/tests/ui/issues/issue-60622.stderr b/tests/ui/lifetimes/late-bound-lifetime-parameters-60622.stderr similarity index 83% rename from tests/ui/issues/issue-60622.stderr rename to tests/ui/lifetimes/late-bound-lifetime-parameters-60622.stderr index 298ef3799f242..880513e02823b 100644 --- a/tests/ui/issues/issue-60622.stderr +++ b/tests/ui/lifetimes/late-bound-lifetime-parameters-60622.stderr @@ -1,5 +1,5 @@ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/issue-60622.rs:10:11 + --> $DIR/late-bound-lifetime-parameters-60622.rs:11:11 | LL | fn a(&self) {} | - the late bound lifetime parameter is introduced here @@ -10,14 +10,14 @@ LL | b.a::<'_, T>(); = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue #42868 note: the lint level is defined here - --> $DIR/issue-60622.rs:1:9 + --> $DIR/late-bound-lifetime-parameters-60622.rs:2:9 | LL | #![deny(warnings)] | ^^^^^^^^ = note: `#[deny(late_bound_lifetime_arguments)]` implied by `#[deny(warnings)]` error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied - --> $DIR/issue-60622.rs:10:7 + --> $DIR/late-bound-lifetime-parameters-60622.rs:11:7 | LL | b.a::<'_, T>(); | ^ - help: remove the unnecessary generic argument @@ -25,7 +25,7 @@ LL | b.a::<'_, T>(); | expected 0 generic arguments | note: method defined here, with 0 generic parameters - --> $DIR/issue-60622.rs:6:8 + --> $DIR/late-bound-lifetime-parameters-60622.rs:7:8 | LL | fn a(&self) {} | ^ diff --git a/tests/ui/issues/issue-7268.rs b/tests/ui/lifetimes/static-bound-fulfillment-with-pointer-7268.rs similarity index 71% rename from tests/ui/issues/issue-7268.rs rename to tests/ui/lifetimes/static-bound-fulfillment-with-pointer-7268.rs index a3bc1bc344626..8ec58e6cd800b 100644 --- a/tests/ui/issues/issue-7268.rs +++ b/tests/ui/lifetimes/static-bound-fulfillment-with-pointer-7268.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7268 //@ check-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-5741.rs b/tests/ui/loops/unreachable-while-loop-5741.rs similarity index 69% rename from tests/ui/issues/issue-5741.rs rename to tests/ui/loops/unreachable-while-loop-5741.rs index af4702ec22ca9..bc69df0f6755c 100644 --- a/tests/ui/issues/issue-5741.rs +++ b/tests/ui/loops/unreachable-while-loop-5741.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5741 //@ run-pass #![allow(while_true)] #![allow(unreachable_code)] diff --git a/tests/ui/issues/issue-7970a.rs b/tests/ui/macros/macro-invocation-span-error-7970.rs similarity index 54% rename from tests/ui/issues/issue-7970a.rs rename to tests/ui/macros/macro-invocation-span-error-7970.rs index dae906410ed61..21337bd92443c 100644 --- a/tests/ui/issues/issue-7970a.rs +++ b/tests/ui/macros/macro-invocation-span-error-7970.rs @@ -1,5 +1,7 @@ +// https://github.com/rust-lang/rust/issues/7970 macro_rules! one_arg_macro { - ($fmt:expr) => (print!(concat!($fmt, "\n"))); + ($fmt:expr) => (print!(concat!($fmt, " +"))); } fn main() { diff --git a/tests/ui/issues/issue-7970a.stderr b/tests/ui/macros/macro-invocation-span-error-7970.stderr similarity index 70% rename from tests/ui/issues/issue-7970a.stderr rename to tests/ui/macros/macro-invocation-span-error-7970.stderr index 1e6bb92ea579e..b165909a9a581 100644 --- a/tests/ui/issues/issue-7970a.stderr +++ b/tests/ui/macros/macro-invocation-span-error-7970.stderr @@ -1,5 +1,5 @@ error: unexpected end of macro invocation - --> $DIR/issue-7970a.rs:6:5 + --> $DIR/macro-invocation-span-error-7970.rs:8:5 | LL | macro_rules! one_arg_macro { | -------------------------- when calling this macro @@ -8,9 +8,9 @@ LL | one_arg_macro!(); | ^^^^^^^^^^^^^^^^ missing tokens in macro arguments | note: while trying to match meta-variable `$fmt:expr` - --> $DIR/issue-7970a.rs:2:6 + --> $DIR/macro-invocation-span-error-7970.rs:3:6 | -LL | ($fmt:expr) => (print!(concat!($fmt, "\n"))); +LL | ($fmt:expr) => (print!(concat!($fmt, " | ^^^^^^^^^ error: aborting due to 1 previous error diff --git a/tests/ui/issues/issue-8521.rs b/tests/ui/macros/macro-path-type-bounds-8521.rs similarity index 84% rename from tests/ui/issues/issue-8521.rs rename to tests/ui/macros/macro-path-type-bounds-8521.rs index 78ce85787d5cf..975d3dc402e1f 100644 --- a/tests/ui/issues/issue-8521.rs +++ b/tests/ui/macros/macro-path-type-bounds-8521.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8521 //@ check-pass trait Foo1 {} diff --git a/tests/ui/issues/issue-7911.rs b/tests/ui/macros/macro-self-mutability-7911.rs similarity index 95% rename from tests/ui/issues/issue-7911.rs rename to tests/ui/macros/macro-self-mutability-7911.rs index 11da4df5285f1..5313f86d97f5f 100644 --- a/tests/ui/issues/issue-7911.rs +++ b/tests/ui/macros/macro-self-mutability-7911.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7911 //@ run-pass // (Closes #7911) Test that we can use the same self expression // with different mutability in macro in two methods diff --git a/tests/ui/issues/issue-7911.stderr b/tests/ui/macros/macro-self-mutability-7911.stderr similarity index 83% rename from tests/ui/issues/issue-7911.stderr rename to tests/ui/macros/macro-self-mutability-7911.stderr index ead7ee191ac9b..7fc2abe06eb39 100644 --- a/tests/ui/issues/issue-7911.stderr +++ b/tests/ui/macros/macro-self-mutability-7911.stderr @@ -1,5 +1,5 @@ warning: method `dummy` is never used - --> $DIR/issue-7911.rs:7:8 + --> $DIR/macro-self-mutability-7911.rs:8:8 | LL | trait FooBar { | ------ method in this trait diff --git a/tests/ui/issues/issue-5554.rs b/tests/ui/macros/macro-variable-declaration-with-bounds-5554.rs similarity index 90% rename from tests/ui/issues/issue-5554.rs rename to tests/ui/macros/macro-variable-declaration-with-bounds-5554.rs index 7d219a0df7093..8ccf8e8013100 100644 --- a/tests/ui/issues/issue-5554.rs +++ b/tests/ui/macros/macro-variable-declaration-with-bounds-5554.rs @@ -1,7 +1,7 @@ +// https://github.com/rust-lang/rust/issues/5554 //@ run-pass #![allow(dead_code)] - pub struct X { a: T, } diff --git a/tests/ui/issues/issue-5718.rs b/tests/ui/macros/macro-variable-unused-reporting-5718.rs similarity index 88% rename from tests/ui/issues/issue-5718.rs rename to tests/ui/macros/macro-variable-unused-reporting-5718.rs index 234fb2e222278..55da925461db5 100644 --- a/tests/ui/issues/issue-5718.rs +++ b/tests/ui/macros/macro-variable-unused-reporting-5718.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5718 //@ run-pass struct Element; diff --git a/tests/ui/issues/issue-5358-1.rs b/tests/ui/match/mismatched-types-in-match-5358-1.rs similarity index 88% rename from tests/ui/issues/issue-5358-1.rs rename to tests/ui/match/mismatched-types-in-match-5358-1.rs index 281f219c03940..95ae241fac008 100644 --- a/tests/ui/issues/issue-5358-1.rs +++ b/tests/ui/match/mismatched-types-in-match-5358-1.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5358-1 enum Either { Left(T), Right(U) } struct S(Either); diff --git a/tests/ui/issues/issue-5358-1.stderr b/tests/ui/match/mismatched-types-in-match-5358-1.stderr similarity index 93% rename from tests/ui/issues/issue-5358-1.stderr rename to tests/ui/match/mismatched-types-in-match-5358-1.stderr index e68db865dc414..8778960897e53 100644 --- a/tests/ui/issues/issue-5358-1.stderr +++ b/tests/ui/match/mismatched-types-in-match-5358-1.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-5358-1.rs:6:9 + --> $DIR/mismatched-types-in-match-5358-1.rs:7:9 | LL | match S(Either::Left(5)) { | ------------------ this expression has type `S` diff --git a/tests/ui/issues/issue-7867.rs b/tests/ui/match/mismatched-types-in-match-7867.rs similarity index 87% rename from tests/ui/issues/issue-7867.rs rename to tests/ui/match/mismatched-types-in-match-7867.rs index 87e7c831e6855..9ff8755c81956 100644 --- a/tests/ui/issues/issue-7867.rs +++ b/tests/ui/match/mismatched-types-in-match-7867.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7867 //@ dont-require-annotations: NOTE enum A { B, C } diff --git a/tests/ui/issues/issue-7867.stderr b/tests/ui/match/mismatched-types-in-match-7867.stderr similarity index 90% rename from tests/ui/issues/issue-7867.stderr rename to tests/ui/match/mismatched-types-in-match-7867.stderr index fcb69d775face..e41a61e42f4b0 100644 --- a/tests/ui/issues/issue-7867.stderr +++ b/tests/ui/match/mismatched-types-in-match-7867.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-7867.rs:9:9 + --> $DIR/mismatched-types-in-match-7867.rs:10:9 | LL | enum A { B, C } | - unit variant defined here diff --git a/tests/ui/issues/issue-61475.rs b/tests/ui/match/pattern-matching-with-double-references-61475.rs similarity index 75% rename from tests/ui/issues/issue-61475.rs rename to tests/ui/match/pattern-matching-with-double-references-61475.rs index ff5e109ea7c8c..bf800ec8b2c66 100644 --- a/tests/ui/issues/issue-61475.rs +++ b/tests/ui/match/pattern-matching-with-double-references-61475.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/61475 //@ run-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-63983.rs b/tests/ui/match/unit-pattern-error-on-tuple-and-struct-variants-63983.rs similarity index 87% rename from tests/ui/issues/issue-63983.rs rename to tests/ui/match/unit-pattern-error-on-tuple-and-struct-variants-63983.rs index ab952666fd1da..e53d14f256e79 100644 --- a/tests/ui/issues/issue-63983.rs +++ b/tests/ui/match/unit-pattern-error-on-tuple-and-struct-variants-63983.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/63983 enum MyEnum { Tuple(i32), Struct{ s: i32 }, diff --git a/tests/ui/issues/issue-63983.stderr b/tests/ui/match/unit-pattern-error-on-tuple-and-struct-variants-63983.stderr similarity index 85% rename from tests/ui/issues/issue-63983.stderr rename to tests/ui/match/unit-pattern-error-on-tuple-and-struct-variants-63983.stderr index 3539732451ce2..5c937a9ddab0b 100644 --- a/tests/ui/issues/issue-63983.stderr +++ b/tests/ui/match/unit-pattern-error-on-tuple-and-struct-variants-63983.stderr @@ -1,5 +1,5 @@ error[E0532]: expected unit struct, unit variant or constant, found tuple variant `MyEnum::Tuple` - --> $DIR/issue-63983.rs:8:9 + --> $DIR/unit-pattern-error-on-tuple-and-struct-variants-63983.rs:9:9 | LL | Tuple(i32), | ---------- `MyEnum::Tuple` defined here @@ -8,7 +8,7 @@ LL | MyEnum::Tuple => "", | ^^^^^^^^^^^^^ help: use the tuple variant pattern syntax instead: `MyEnum::Tuple(_)` error[E0533]: expected unit struct, unit variant or constant, found struct variant `MyEnum::Struct` - --> $DIR/issue-63983.rs:10:9 + --> $DIR/unit-pattern-error-on-tuple-and-struct-variants-63983.rs:11:9 | LL | MyEnum::Struct => "", | ^^^^^^^^^^^^^^ not a unit struct, unit variant or constant diff --git a/tests/ui/issues/issue-7575.rs b/tests/ui/methods/trait-method-resolution-7575.rs similarity index 83% rename from tests/ui/issues/issue-7575.rs rename to tests/ui/methods/trait-method-resolution-7575.rs index 8b1fdf6c851e2..9793d43cc24fc 100644 --- a/tests/ui/issues/issue-7575.rs +++ b/tests/ui/methods/trait-method-resolution-7575.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7575 //@ run-pass trait Foo { //~ WARN trait `Foo` is never used diff --git a/tests/ui/issues/issue-7575.stderr b/tests/ui/methods/trait-method-resolution-7575.stderr similarity index 76% rename from tests/ui/issues/issue-7575.stderr rename to tests/ui/methods/trait-method-resolution-7575.stderr index 2f987d19c80ce..54a11204525ef 100644 --- a/tests/ui/issues/issue-7575.stderr +++ b/tests/ui/methods/trait-method-resolution-7575.stderr @@ -1,5 +1,5 @@ warning: trait `Foo` is never used - --> $DIR/issue-7575.rs:3:7 + --> $DIR/trait-method-resolution-7575.rs:4:7 | LL | trait Foo { | ^^^ diff --git a/tests/ui/issues/issue-81918.rs b/tests/ui/mir/mir-cfg-unpretty-no-panic-81918.rs similarity index 81% rename from tests/ui/issues/issue-81918.rs rename to tests/ui/mir/mir-cfg-unpretty-no-panic-81918.rs index ee9721c2493de..4798a6543755d 100644 --- a/tests/ui/issues/issue-81918.rs +++ b/tests/ui/mir/mir-cfg-unpretty-no-panic-81918.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/81918 //@ check-pass //@ dont-check-compiler-stdout //@ compile-flags: -Z unpretty=mir-cfg diff --git a/tests/ui/issues/auxiliary/issue-56943.rs b/tests/ui/mismatched_types/auxiliary/aux-56943.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-56943.rs rename to tests/ui/mismatched_types/auxiliary/aux-56943.rs diff --git a/tests/ui/issues/issue-66923-show-error-for-correct-call.rs b/tests/ui/mismatched_types/collect-method-type-mismatch-66923-.rs similarity index 88% rename from tests/ui/issues/issue-66923-show-error-for-correct-call.rs rename to tests/ui/mismatched_types/collect-method-type-mismatch-66923-.rs index 8332807397247..3526a783c3ed7 100644 --- a/tests/ui/issues/issue-66923-show-error-for-correct-call.rs +++ b/tests/ui/mismatched_types/collect-method-type-mismatch-66923-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/66923- // This test checks that errors are showed for lines with `collect` rather than `push` method. fn main() { diff --git a/tests/ui/issues/issue-66923-show-error-for-correct-call.stderr b/tests/ui/mismatched_types/collect-method-type-mismatch-66923-.stderr similarity index 89% rename from tests/ui/issues/issue-66923-show-error-for-correct-call.stderr rename to tests/ui/mismatched_types/collect-method-type-mismatch-66923-.stderr index d2852093725ce..25fea8608a534 100644 --- a/tests/ui/issues/issue-66923-show-error-for-correct-call.stderr +++ b/tests/ui/mismatched_types/collect-method-type-mismatch-66923-.stderr @@ -1,5 +1,5 @@ error[E0277]: a value of type `Vec` cannot be built from an iterator over elements of type `&f64` - --> $DIR/issue-66923-show-error-for-correct-call.rs:8:39 + --> $DIR/collect-method-type-mismatch-66923-.rs:9:39 | LL | let x2: Vec = x1.into_iter().collect(); | ^^^^^^^ value of type `Vec` cannot be built from `std::iter::Iterator` @@ -8,7 +8,7 @@ LL | let x2: Vec = x1.into_iter().collect(); but trait `FromIterator<_>` is implemented for it = help: for that trait implementation, expected `f64`, found `&f64` note: the method call chain might not have had the expected associated types - --> $DIR/issue-66923-show-error-for-correct-call.rs:8:27 + --> $DIR/collect-method-type-mismatch-66923-.rs:9:27 | LL | let x1: &[f64] = &v; | -- this expression has type `&Vec` @@ -18,7 +18,7 @@ note: required by a bound in `collect` --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL error[E0277]: a value of type `Vec` cannot be built from an iterator over elements of type `&f64` - --> $DIR/issue-66923-show-error-for-correct-call.rs:12:39 + --> $DIR/collect-method-type-mismatch-66923-.rs:13:39 | LL | let x3 = x1.into_iter().collect::>(); | ------- ^^^^^^^^ value of type `Vec` cannot be built from `std::iter::Iterator` @@ -29,7 +29,7 @@ LL | let x3 = x1.into_iter().collect::>(); but trait `FromIterator<_>` is implemented for it = help: for that trait implementation, expected `f64`, found `&f64` note: the method call chain might not have had the expected associated types - --> $DIR/issue-66923-show-error-for-correct-call.rs:12:17 + --> $DIR/collect-method-type-mismatch-66923-.rs:13:17 | LL | let x1: &[f64] = &v; | -- this expression has type `&Vec` diff --git a/tests/ui/issues/issue-61106.rs b/tests/ui/mismatched_types/string-clone-mismatch-61106.rs similarity index 68% rename from tests/ui/issues/issue-61106.rs rename to tests/ui/mismatched_types/string-clone-mismatch-61106.rs index 308ef1de3ccc3..1582ed3ec978d 100644 --- a/tests/ui/issues/issue-61106.rs +++ b/tests/ui/mismatched_types/string-clone-mismatch-61106.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/61106 fn main() { let x = String::new(); foo(x.clone()); //~ ERROR mismatched types diff --git a/tests/ui/issues/issue-61106.stderr b/tests/ui/mismatched_types/string-clone-mismatch-61106.stderr similarity index 82% rename from tests/ui/issues/issue-61106.stderr rename to tests/ui/mismatched_types/string-clone-mismatch-61106.stderr index f825141fa062a..8e41f42a6d8f8 100644 --- a/tests/ui/issues/issue-61106.stderr +++ b/tests/ui/mismatched_types/string-clone-mismatch-61106.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-61106.rs:3:9 + --> $DIR/string-clone-mismatch-61106.rs:4:9 | LL | foo(x.clone()); | --- ^^^^^^^^^ expected `&str`, found `String` @@ -7,7 +7,7 @@ LL | foo(x.clone()); | arguments to this function are incorrect | note: function defined here - --> $DIR/issue-61106.rs:6:4 + --> $DIR/string-clone-mismatch-61106.rs:7:4 | LL | fn foo(_: &str) {} | ^^^ ------- diff --git a/tests/ui/mismatched_types/type-mismatch-in-extern-crate-56943.rs b/tests/ui/mismatched_types/type-mismatch-in-extern-crate-56943.rs new file mode 100644 index 0000000000000..9970b27c847b3 --- /dev/null +++ b/tests/ui/mismatched_types/type-mismatch-in-extern-crate-56943.rs @@ -0,0 +1,9 @@ +// https://github.com/rust-lang/rust/issues/56943 +//@ aux-build:aux-56943.rs + +extern crate aux_56943; + +fn main() { + let _: aux_56943::S = aux_56943::S2; + //~^ ERROR mismatched types [E0308] +} diff --git a/tests/ui/issues/issue-56943.stderr b/tests/ui/mismatched_types/type-mismatch-in-extern-crate-56943.stderr similarity index 54% rename from tests/ui/issues/issue-56943.stderr rename to tests/ui/mismatched_types/type-mismatch-in-extern-crate-56943.stderr index 60a2e92dc71b5..2315267701d14 100644 --- a/tests/ui/issues/issue-56943.stderr +++ b/tests/ui/mismatched_types/type-mismatch-in-extern-crate-56943.stderr @@ -1,8 +1,8 @@ error[E0308]: mismatched types - --> $DIR/issue-56943.rs:6:29 + --> $DIR/type-mismatch-in-extern-crate-56943.rs:7:27 | -LL | let _: issue_56943::S = issue_56943::S2; - | -------------- ^^^^^^^^^^^^^^^ expected `S`, found `S2` +LL | let _: aux_56943::S = aux_56943::S2; + | ------------ ^^^^^^^^^^^^^ expected `S`, found `S2` | | | expected due to this diff --git a/tests/ui/issues/issue-56128.rs b/tests/ui/modules/pub-use-handling-in-modules-56128.rs similarity index 84% rename from tests/ui/issues/issue-56128.rs rename to tests/ui/modules/pub-use-handling-in-modules-56128.rs index cc170f60250ff..60d5ee1eef405 100644 --- a/tests/ui/issues/issue-56128.rs +++ b/tests/ui/modules/pub-use-handling-in-modules-56128.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/56128 // Regression test for #56128. When this `pub(super) use...` gets // exploded in the HIR, we were not handling ids correctly. // diff --git a/tests/ui/issues/issue-5950.rs b/tests/ui/modules/pub-use-module-alias-5950.rs similarity index 62% rename from tests/ui/issues/issue-5950.rs rename to tests/ui/modules/pub-use-module-alias-5950.rs index 6015560fcf8a9..91d3f9b16ff0d 100644 --- a/tests/ui/issues/issue-5950.rs +++ b/tests/ui/modules/pub-use-module-alias-5950.rs @@ -1,6 +1,6 @@ +// https://github.com/rust-lang/rust/issues/5950 //@ check-pass - pub use local as local_alias; pub mod local { } diff --git a/tests/ui/issues/issue-7663.rs b/tests/ui/modules/use-statement-duplicate-check-7663.rs similarity index 91% rename from tests/ui/issues/issue-7663.rs rename to tests/ui/modules/use-statement-duplicate-check-7663.rs index d2b2c727cab25..872806594fc40 100644 --- a/tests/ui/issues/issue-7663.rs +++ b/tests/ui/modules/use-statement-duplicate-check-7663.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7663 //@ run-pass #![allow(unused_imports, dead_code)] diff --git a/tests/ui/issues/issue-64430.rs b/tests/ui/no_std/no-std-panic-abort-error-64430.rs similarity index 79% rename from tests/ui/issues/issue-64430.rs rename to tests/ui/no_std/no-std-panic-abort-error-64430.rs index bc98dbf8520f0..bd25597d6d754 100644 --- a/tests/ui/issues/issue-64430.rs +++ b/tests/ui/no_std/no-std-panic-abort-error-64430.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/64430 //@ compile-flags:-C panic=abort #![no_std] diff --git a/tests/ui/issues/issue-64430.stderr b/tests/ui/no_std/no-std-panic-abort-error-64430.stderr similarity index 87% rename from tests/ui/issues/issue-64430.stderr rename to tests/ui/no_std/no-std-panic-abort-error-64430.stderr index 1c8e020e9cbb4..452721cd4fdd7 100644 --- a/tests/ui/issues/issue-64430.stderr +++ b/tests/ui/no_std/no-std-panic-abort-error-64430.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `bar` found for struct `Foo` in the current scope - --> $DIR/issue-64430.rs:7:9 + --> $DIR/no-std-panic-abort-error-64430.rs:8:9 | LL | pub struct Foo; | -------------- method `bar` not found for this struct diff --git a/tests/ui/issues/issue-6130.rs b/tests/ui/numeric/type-limit-comparisons-6130.rs similarity index 77% rename from tests/ui/issues/issue-6130.rs rename to tests/ui/numeric/type-limit-comparisons-6130.rs index c675a8a41dd0b..54b3f631e67bc 100644 --- a/tests/ui/issues/issue-6130.rs +++ b/tests/ui/numeric/type-limit-comparisons-6130.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/6130 //@ run-pass pub fn main() { diff --git a/tests/ui/issues/issue-68696-catch-during-unwind.rs b/tests/ui/panic-handler/catch-unwind-during-unwind-68696-.rs similarity index 92% rename from tests/ui/issues/issue-68696-catch-during-unwind.rs rename to tests/ui/panic-handler/catch-unwind-during-unwind-68696-.rs index 80d63b0cde705..59654c06be93f 100644 --- a/tests/ui/issues/issue-68696-catch-during-unwind.rs +++ b/tests/ui/panic-handler/catch-unwind-during-unwind-68696-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/68696- // Checks that catch_unwind can be used if unwinding is already in progress. // Used to fail when standard library had been compiled with debug assertions, // due to incorrect assumption that a current thread is not panicking when diff --git a/tests/ui/issues/issue-69130.rs b/tests/ui/parser/character-indexing-bug-in-splice-lines-69130.rs similarity index 79% rename from tests/ui/issues/issue-69130.rs rename to tests/ui/parser/character-indexing-bug-in-splice-lines-69130.rs index 90dffc99db7f5..4937f78e615b2 100644 --- a/tests/ui/issues/issue-69130.rs +++ b/tests/ui/parser/character-indexing-bug-in-splice-lines-69130.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/69130 // Issue 69130: character indexing bug in rustc_errors::CodeSuggestion::splice_lines(). enum F { diff --git a/tests/ui/issues/issue-69130.stderr b/tests/ui/parser/character-indexing-bug-in-splice-lines-69130.stderr similarity index 75% rename from tests/ui/issues/issue-69130.stderr rename to tests/ui/parser/character-indexing-bug-in-splice-lines-69130.stderr index e67cc295d43e1..b19d8fb8ac3fa 100644 --- a/tests/ui/issues/issue-69130.stderr +++ b/tests/ui/parser/character-indexing-bug-in-splice-lines-69130.stderr @@ -1,11 +1,11 @@ error: unknown start of token: \u{a7} - --> $DIR/issue-69130.rs:4:4 + --> $DIR/character-indexing-bug-in-splice-lines-69130.rs:5:4 | LL | M (ยง& u8)} | ^ error[E0106]: missing lifetime specifier - --> $DIR/issue-69130.rs:4:5 + --> $DIR/character-indexing-bug-in-splice-lines-69130.rs:5:5 | LL | M (ยง& u8)} | ^ expected named lifetime parameter diff --git a/tests/ui/issues/issue-55587.rs b/tests/ui/parser/invalid-variable-definition-55587.rs similarity index 67% rename from tests/ui/issues/issue-55587.rs rename to tests/ui/parser/invalid-variable-definition-55587.rs index d9100cf555b3c..f2c7c0a8e6c34 100644 --- a/tests/ui/issues/issue-55587.rs +++ b/tests/ui/parser/invalid-variable-definition-55587.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/55587 use std::path::Path; fn main() { diff --git a/tests/ui/issues/issue-55587.stderr b/tests/ui/parser/invalid-variable-definition-55587.stderr similarity index 88% rename from tests/ui/issues/issue-55587.stderr rename to tests/ui/parser/invalid-variable-definition-55587.stderr index 7a5d0e281007f..08c951582e3f7 100644 --- a/tests/ui/issues/issue-55587.stderr +++ b/tests/ui/parser/invalid-variable-definition-55587.stderr @@ -1,5 +1,5 @@ error[E0164]: expected tuple struct or tuple variant, found associated function `Path::new` - --> $DIR/issue-55587.rs:4:9 + --> $DIR/invalid-variable-definition-55587.rs:5:9 | LL | let Path::new(); | ^^^^^^^^^^^ `fn` calls are not allowed in patterns diff --git a/tests/ui/issues/issue-64792-bad-unicode-ctor.rs b/tests/ui/parser/unicode-string-literal-syntax-error-64792-.rs similarity index 71% rename from tests/ui/issues/issue-64792-bad-unicode-ctor.rs rename to tests/ui/parser/unicode-string-literal-syntax-error-64792-.rs index f1427ef46e928..01ce84924c44c 100644 --- a/tests/ui/issues/issue-64792-bad-unicode-ctor.rs +++ b/tests/ui/parser/unicode-string-literal-syntax-error-64792-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/64792- struct X {} const Y: X = X("รถ"); //~ ERROR expected function, tuple struct or tuple variant, found struct `X` diff --git a/tests/ui/issues/issue-64792-bad-unicode-ctor.stderr b/tests/ui/parser/unicode-string-literal-syntax-error-64792-.stderr similarity index 85% rename from tests/ui/issues/issue-64792-bad-unicode-ctor.stderr rename to tests/ui/parser/unicode-string-literal-syntax-error-64792-.stderr index 7fc414602d281..74c8283a23f46 100644 --- a/tests/ui/issues/issue-64792-bad-unicode-ctor.stderr +++ b/tests/ui/parser/unicode-string-literal-syntax-error-64792-.stderr @@ -1,5 +1,5 @@ error[E0423]: expected function, tuple struct or tuple variant, found struct `X` - --> $DIR/issue-64792-bad-unicode-ctor.rs:3:14 + --> $DIR/unicode-string-literal-syntax-error-64792-.rs:4:14 | LL | struct X {} | ----------- `X` defined here diff --git a/tests/ui/issues/issue-67039-unsound-pin-partialeq.rs b/tests/ui/pin/pin-deref-target-partial-eq-67039-.rs similarity index 92% rename from tests/ui/issues/issue-67039-unsound-pin-partialeq.rs rename to tests/ui/pin/pin-deref-target-partial-eq-67039-.rs index a496e58a79bdd..278d2db0bba1d 100644 --- a/tests/ui/issues/issue-67039-unsound-pin-partialeq.rs +++ b/tests/ui/pin/pin-deref-target-partial-eq-67039-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/67039- // Pin's PartialEq implementation allowed to access the pointer allowing for // unsoundness by using Rc::get_mut to move value within Rc. // See https://internals.rust-lang.org/t/unsoundness-in-pin/11311/73 for more details. diff --git a/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr b/tests/ui/pin/pin-deref-target-partial-eq-67039-.stderr similarity index 89% rename from tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr rename to tests/ui/pin/pin-deref-target-partial-eq-67039-.stderr index 9164e4696eb34..b7a00ed8ff9ca 100644 --- a/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr +++ b/tests/ui/pin/pin-deref-target-partial-eq-67039-.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving ` as Deref>::Target == Rc` - --> $DIR/issue-67039-unsound-pin-partialeq.rs:25:29 + --> $DIR/pin-deref-target-partial-eq-67039-.rs:26:29 | LL | let _ = Pin::new(Apple) == Rc::pin(Apple); | ^^ expected `Rc`, found `Apple` diff --git a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.fixed b/tests/ui/privacy/inaccessible-private-fields-76077-1.fixed similarity index 89% rename from tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.fixed rename to tests/ui/privacy/inaccessible-private-fields-76077-1.fixed index 6fde4e390fa1a..116a3614de30d 100644 --- a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.fixed +++ b/tests/ui/privacy/inaccessible-private-fields-76077-1.fixed @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/76077-1 //@ run-rustfix #![allow(dead_code, unused_variables)] diff --git a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.rs b/tests/ui/privacy/inaccessible-private-fields-76077-1.rs similarity index 89% rename from tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.rs rename to tests/ui/privacy/inaccessible-private-fields-76077-1.rs index 30a8535faf5cc..8ea124ebdc811 100644 --- a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.rs +++ b/tests/ui/privacy/inaccessible-private-fields-76077-1.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/76077-1 //@ run-rustfix #![allow(dead_code, unused_variables)] diff --git a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.stderr b/tests/ui/privacy/inaccessible-private-fields-76077-1.stderr similarity index 84% rename from tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.stderr rename to tests/ui/privacy/inaccessible-private-fields-76077-1.stderr index f54990d5d8618..aa2b88150f817 100644 --- a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077-1.stderr +++ b/tests/ui/privacy/inaccessible-private-fields-76077-1.stderr @@ -1,5 +1,5 @@ error: pattern requires `..` due to inaccessible fields - --> $DIR/issue-76077-1.rs:13:9 + --> $DIR/inaccessible-private-fields-76077-1.rs:14:9 | LL | let foo::Foo {} = foo::Foo::default(); | ^^^^^^^^^^^ @@ -10,7 +10,7 @@ LL | let foo::Foo { .. } = foo::Foo::default(); | ++ error: pattern requires `..` due to inaccessible fields - --> $DIR/issue-76077-1.rs:16:9 + --> $DIR/inaccessible-private-fields-76077-1.rs:17:9 | LL | let foo::Bar { visible } = foo::Bar::default(); | ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077.rs b/tests/ui/privacy/private-field-struct-construction-76077.rs similarity index 80% rename from tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077.rs rename to tests/ui/privacy/private-field-struct-construction-76077.rs index 2d29093b01b02..7fc3473e8decc 100644 --- a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077.rs +++ b/tests/ui/privacy/private-field-struct-construction-76077.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/76077 pub mod foo { pub struct Foo { you_cant_use_this_field: bool, diff --git a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077.stderr b/tests/ui/privacy/private-field-struct-construction-76077.stderr similarity index 80% rename from tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077.stderr rename to tests/ui/privacy/private-field-struct-construction-76077.stderr index 3fef5ffce30dc..5131db72fe3bf 100644 --- a/tests/ui/issues/issue-76077-inaccesible-private-fields/issue-76077.stderr +++ b/tests/ui/privacy/private-field-struct-construction-76077.stderr @@ -1,5 +1,5 @@ error: cannot construct `Foo` with struct literal syntax due to private fields - --> $DIR/issue-76077.rs:8:5 + --> $DIR/private-field-struct-construction-76077.rs:9:5 | LL | foo::Foo {}; | ^^^^^^^^ diff --git a/tests/ui/issues/issue-55376.rs b/tests/ui/privacy/pub-restricted-path-usage-55376.rs similarity index 85% rename from tests/ui/issues/issue-55376.rs rename to tests/ui/privacy/pub-restricted-path-usage-55376.rs index 5a6862b6530b1..ca4e27c30a8fc 100644 --- a/tests/ui/issues/issue-55376.rs +++ b/tests/ui/privacy/pub-restricted-path-usage-55376.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/55376 //@ run-pass // Tests that paths in `pub(...)` don't fail HIR verification. diff --git a/tests/ui/issues/issue-8727.rs b/tests/ui/recursion/infinite-function-recursion-error-8727.rs similarity index 90% rename from tests/ui/issues/issue-8727.rs rename to tests/ui/recursion/infinite-function-recursion-error-8727.rs index c1b60e8e08509..a4037f761098e 100644 --- a/tests/ui/issues/issue-8727.rs +++ b/tests/ui/recursion/infinite-function-recursion-error-8727.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8727 // Verify the compiler fails with an error on infinite function // recursions. @@ -9,7 +10,6 @@ fn generic() { //~ WARN function cannot return without recursing } //~^^ ERROR reached the recursion limit while instantiating `generic:: at least once to trigger instantiation. generic::(); diff --git a/tests/ui/issues/issue-8727.stderr b/tests/ui/recursion/infinite-function-recursion-error-8727.stderr similarity index 76% rename from tests/ui/issues/issue-8727.stderr rename to tests/ui/recursion/infinite-function-recursion-error-8727.stderr index 9fb09a7d4f42d..13d57ecb3b2f0 100644 --- a/tests/ui/issues/issue-8727.stderr +++ b/tests/ui/recursion/infinite-function-recursion-error-8727.stderr @@ -1,5 +1,5 @@ warning: function cannot return without recursing - --> $DIR/issue-8727.rs:7:1 + --> $DIR/infinite-function-recursion-error-8727.rs:8:1 | LL | fn generic() { | ^^^^^^^^^^^^^^^ cannot return without recursing @@ -10,17 +10,17 @@ LL | generic::>(); = note: `#[warn(unconditional_recursion)]` on by default error: reached the recursion limit while instantiating `generic::>>>>` - --> $DIR/issue-8727.rs:8:5 + --> $DIR/infinite-function-recursion-error-8727.rs:9:5 | LL | generic::>(); | ^^^^^^^^^^^^^^^^^^^^^^ | note: `generic` defined here - --> $DIR/issue-8727.rs:7:1 + --> $DIR/infinite-function-recursion-error-8727.rs:8:1 | LL | fn generic() { | ^^^^^^^^^^^^^^^ - = note: the full name for the type has been written to '$TEST_BUILD_DIR/issue-8727.long-type-$LONG_TYPE_HASH.txt' + = note: the full name for the type has been written to '$TEST_BUILD_DIR/infinite-function-recursion-error-8727.long-type-$LONG_TYPE_HASH.txt' = note: consider using `--verbose` to print the full type name to the console error: aborting due to 1 previous error; 1 warning emitted diff --git a/tests/ui/issues/auxiliary/issue-73112.rs b/tests/ui/repr/auxiliary/aux-73112.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-73112.rs rename to tests/ui/repr/auxiliary/aux-73112.rs diff --git a/tests/ui/issues/issue-74082.rs b/tests/ui/repr/invalid-repr-on-structs-74082.rs similarity index 79% rename from tests/ui/issues/issue-74082.rs rename to tests/ui/repr/invalid-repr-on-structs-74082.rs index e3e400c79d658..8b9807fad8ce2 100644 --- a/tests/ui/issues/issue-74082.rs +++ b/tests/ui/repr/invalid-repr-on-structs-74082.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/74082 #![allow(dead_code)] #[repr(i128)] //~ ERROR: attribute should be applied to an enum diff --git a/tests/ui/issues/issue-74082.stderr b/tests/ui/repr/invalid-repr-on-structs-74082.stderr similarity index 80% rename from tests/ui/issues/issue-74082.stderr rename to tests/ui/repr/invalid-repr-on-structs-74082.stderr index 12f5a3b27bb30..e11beb811fbff 100644 --- a/tests/ui/issues/issue-74082.stderr +++ b/tests/ui/repr/invalid-repr-on-structs-74082.stderr @@ -1,5 +1,5 @@ error[E0517]: attribute should be applied to an enum - --> $DIR/issue-74082.rs:3:8 + --> $DIR/invalid-repr-on-structs-74082.rs:4:8 | LL | #[repr(i128)] | ^^^^ @@ -7,7 +7,7 @@ LL | struct Foo; | ----------- not an enum error[E0517]: attribute should be applied to an enum - --> $DIR/issue-74082.rs:6:8 + --> $DIR/invalid-repr-on-structs-74082.rs:7:8 | LL | #[repr(u128)] | ^^^^ diff --git a/tests/ui/issues/issue-73112.rs b/tests/ui/repr/packed-struct-contains-aligned-type-73112.rs similarity index 58% rename from tests/ui/issues/issue-73112.rs rename to tests/ui/repr/packed-struct-contains-aligned-type-73112.rs index 89075b756249d..baeb75beb0aa1 100644 --- a/tests/ui/issues/issue-73112.rs +++ b/tests/ui/repr/packed-struct-contains-aligned-type-73112.rs @@ -1,9 +1,10 @@ -//@ aux-build:issue-73112.rs +// https://github.com/rust-lang/rust/issues/73112 +//@ aux-build:aux-73112.rs -extern crate issue_73112; +extern crate aux_73112; fn main() { - use issue_73112::PageTable; + use aux_73112::PageTable; #[repr(C, packed)] struct SomeStruct { diff --git a/tests/ui/issues/issue-73112.stderr b/tests/ui/repr/packed-struct-contains-aligned-type-73112.stderr similarity index 78% rename from tests/ui/issues/issue-73112.stderr rename to tests/ui/repr/packed-struct-contains-aligned-type-73112.stderr index c2c15ca10ce2e..237c357db22ba 100644 --- a/tests/ui/issues/issue-73112.stderr +++ b/tests/ui/repr/packed-struct-contains-aligned-type-73112.stderr @@ -1,11 +1,11 @@ error[E0588]: packed type cannot transitively contain a `#[repr(align)]` type - --> $DIR/issue-73112.rs:9:5 + --> $DIR/packed-struct-contains-aligned-type-73112.rs:10:5 | LL | struct SomeStruct { | ^^^^^^^^^^^^^^^^^ | note: `PageTable` has a `#[repr(align)]` attribute - --> $DIR/auxiliary/issue-73112.rs:8:1 + --> $DIR/auxiliary/aux-73112.rs:8:1 | LL | pub struct PageTable { | ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-53728.rs b/tests/ui/repr/packed-struct-with-enum-53728.rs similarity index 85% rename from tests/ui/issues/issue-53728.rs rename to tests/ui/repr/packed-struct-with-enum-53728.rs index 364965228c608..6ce65ed634fc5 100644 --- a/tests/ui/issues/issue-53728.rs +++ b/tests/ui/repr/packed-struct-with-enum-53728.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/53728 //@ run-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-6936.rs b/tests/ui/resolve/duplicate-name-in-module-6936.rs similarity index 91% rename from tests/ui/issues/issue-6936.rs rename to tests/ui/resolve/duplicate-name-in-module-6936.rs index e9aa80b4eb33d..ae9282c0c24a0 100644 --- a/tests/ui/issues/issue-6936.rs +++ b/tests/ui/resolve/duplicate-name-in-module-6936.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/6936 struct T; mod t1 { @@ -30,5 +31,4 @@ mod t6 { impl Foo {} // ok } - fn main() {} diff --git a/tests/ui/issues/issue-6936.stderr b/tests/ui/resolve/duplicate-name-in-module-6936.stderr similarity index 87% rename from tests/ui/issues/issue-6936.stderr rename to tests/ui/resolve/duplicate-name-in-module-6936.stderr index 03cc50636b4b8..76bb8f57386b1 100644 --- a/tests/ui/issues/issue-6936.stderr +++ b/tests/ui/resolve/duplicate-name-in-module-6936.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `Foo` is defined multiple times - --> $DIR/issue-6936.rs:5:5 + --> $DIR/duplicate-name-in-module-6936.rs:6:5 | LL | type Foo = crate::T; | -------------------- previous definition of the type `Foo` here @@ -9,7 +9,7 @@ LL | mod Foo {} = note: `Foo` must be defined only once in the type namespace of this module error[E0428]: the name `Foo` is defined multiple times - --> $DIR/issue-6936.rs:10:5 + --> $DIR/duplicate-name-in-module-6936.rs:11:5 | LL | type Foo = crate::T; | -------------------- previous definition of the type `Foo` here @@ -19,7 +19,7 @@ LL | struct Foo; = note: `Foo` must be defined only once in the type namespace of this module error[E0428]: the name `Foo` is defined multiple times - --> $DIR/issue-6936.rs:15:5 + --> $DIR/duplicate-name-in-module-6936.rs:16:5 | LL | type Foo = crate::T; | -------------------- previous definition of the type `Foo` here @@ -29,7 +29,7 @@ LL | enum Foo {} = note: `Foo` must be defined only once in the type namespace of this module error[E0428]: the name `Bar` is defined multiple times - --> $DIR/issue-6936.rs:25:5 + --> $DIR/duplicate-name-in-module-6936.rs:26:5 | LL | type Bar = T; | ---------------- previous definition of the type `Bar` here diff --git a/tests/ui/issues/issue-71406.rs b/tests/ui/resolve/function-module-ambiguity-error-71406.rs similarity index 74% rename from tests/ui/issues/issue-71406.rs rename to tests/ui/resolve/function-module-ambiguity-error-71406.rs index 6266112c3a86c..a7964de9ba5e2 100644 --- a/tests/ui/issues/issue-71406.rs +++ b/tests/ui/resolve/function-module-ambiguity-error-71406.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/71406 use std::sync::mpsc; fn main() { diff --git a/tests/ui/issues/issue-71406.stderr b/tests/ui/resolve/function-module-ambiguity-error-71406.stderr similarity index 85% rename from tests/ui/issues/issue-71406.stderr rename to tests/ui/resolve/function-module-ambiguity-error-71406.stderr index cd7921f550e5d..c25bafa0a5ddb 100644 --- a/tests/ui/issues/issue-71406.stderr +++ b/tests/ui/resolve/function-module-ambiguity-error-71406.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve: expected type, found function `channel` in `mpsc` - --> $DIR/issue-71406.rs:4:26 + --> $DIR/function-module-ambiguity-error-71406.rs:5:26 | LL | let (tx, rx) = mpsc::channel::new(1); | ^^^^^^^ expected type, found function `channel` in `mpsc` diff --git a/tests/ui/issues/issue-58712.rs b/tests/ui/resolve/missing-type-in-scope-58712.rs similarity index 84% rename from tests/ui/issues/issue-58712.rs rename to tests/ui/resolve/missing-type-in-scope-58712.rs index 930bec6889bce..b9ff74e426dfc 100644 --- a/tests/ui/issues/issue-58712.rs +++ b/tests/ui/resolve/missing-type-in-scope-58712.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/58712 struct AddrVec { h: H, a: A, diff --git a/tests/ui/issues/issue-58712.stderr b/tests/ui/resolve/missing-type-in-scope-58712.stderr similarity index 85% rename from tests/ui/issues/issue-58712.stderr rename to tests/ui/resolve/missing-type-in-scope-58712.stderr index f4bd4d1e826a0..d7e06eee856c9 100644 --- a/tests/ui/issues/issue-58712.stderr +++ b/tests/ui/resolve/missing-type-in-scope-58712.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `DeviceId` in this scope - --> $DIR/issue-58712.rs:6:20 + --> $DIR/missing-type-in-scope-58712.rs:7:20 | LL | impl AddrVec { | ^^^^^^^^ not found in this scope @@ -10,7 +10,7 @@ LL | impl AddrVec { | ++++++++++ error[E0412]: cannot find type `DeviceId` in this scope - --> $DIR/issue-58712.rs:8:29 + --> $DIR/missing-type-in-scope-58712.rs:9:29 | LL | pub fn device(&self) -> DeviceId { | ^^^^^^^^ not found in this scope diff --git a/tests/ui/issues/issue-55380.rs b/tests/ui/specialization/trait-specialization-default-methods-55380.rs similarity index 90% rename from tests/ui/issues/issue-55380.rs rename to tests/ui/specialization/trait-specialization-default-methods-55380.rs index 54894cdede021..b3d79fb5ffb6a 100644 --- a/tests/ui/issues/issue-55380.rs +++ b/tests/ui/specialization/trait-specialization-default-methods-55380.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/55380 //@ run-pass #![feature(specialization)] //~^ WARN the feature `specialization` is incomplete diff --git a/tests/ui/issues/issue-55380.stderr b/tests/ui/specialization/trait-specialization-default-methods-55380.stderr similarity index 88% rename from tests/ui/issues/issue-55380.stderr rename to tests/ui/specialization/trait-specialization-default-methods-55380.stderr index 403844c726fa2..f7c1903da6292 100644 --- a/tests/ui/issues/issue-55380.stderr +++ b/tests/ui/specialization/trait-specialization-default-methods-55380.stderr @@ -1,5 +1,5 @@ warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes - --> $DIR/issue-55380.rs:2:12 + --> $DIR/trait-specialization-default-methods-55380.rs:3:12 | LL | #![feature(specialization)] | ^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-7364.rs b/tests/ui/static/global-variable-promotion-error-7364.rs similarity index 84% rename from tests/ui/issues/issue-7364.rs rename to tests/ui/static/global-variable-promotion-error-7364.rs index 4ce9beb68cd3f..dba4a484d6115 100644 --- a/tests/ui/issues/issue-7364.rs +++ b/tests/ui/static/global-variable-promotion-error-7364.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7364 use std::cell::RefCell; // Regression test for issue 7364 diff --git a/tests/ui/issues/issue-7364.stderr b/tests/ui/static/global-variable-promotion-error-7364.stderr similarity index 91% rename from tests/ui/issues/issue-7364.stderr rename to tests/ui/static/global-variable-promotion-error-7364.stderr index a47a90c90ce16..b9d75676bef89 100644 --- a/tests/ui/issues/issue-7364.stderr +++ b/tests/ui/static/global-variable-promotion-error-7364.stderr @@ -1,5 +1,5 @@ error[E0277]: `RefCell` cannot be shared between threads safely - --> $DIR/issue-7364.rs:4:15 + --> $DIR/global-variable-promotion-error-7364.rs:5:15 | LL | static boxed: Box> = Box::new(RefCell::new(0)); | ^^^^^^^^^^^^^^^^^^^ `RefCell` cannot be shared between threads safely @@ -12,7 +12,7 @@ note: required because it appears within the type `Box>` = note: shared static variables must have a type that implements `Sync` error[E0015]: cannot call non-const associated function `Box::>::new` in statics - --> $DIR/issue-7364.rs:4:37 + --> $DIR/global-variable-promotion-error-7364.rs:5:37 | LL | static boxed: Box> = Box::new(RefCell::new(0)); | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-5917.rs b/tests/ui/static/static-list-initialization-5917.rs similarity index 78% rename from tests/ui/issues/issue-5917.rs rename to tests/ui/static/static-list-initialization-5917.rs index 8e91b1052a2d0..c6c32f7582e17 100644 --- a/tests/ui/issues/issue-5917.rs +++ b/tests/ui/static/static-list-initialization-5917.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5917 //@ run-pass #![allow(non_upper_case_globals)] diff --git a/tests/ui/issues/issue-5688.rs b/tests/ui/static/static-struct-initialization-5688.rs similarity index 90% rename from tests/ui/issues/issue-5688.rs rename to tests/ui/static/static-struct-initialization-5688.rs index a7db1dfb15f6c..6a4c2f45b6b35 100644 --- a/tests/ui/issues/issue-5688.rs +++ b/tests/ui/static/static-struct-initialization-5688.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5688 //@ run-pass /* # Corrupted initialization in the static struct diff --git a/tests/ui/issues/issue-8578.rs b/tests/ui/static/static-struct-with-option-8578.rs similarity index 90% rename from tests/ui/issues/issue-8578.rs rename to tests/ui/static/static-struct-with-option-8578.rs index 9baa2f70a02db..d490a3f50b419 100644 --- a/tests/ui/issues/issue-8578.rs +++ b/tests/ui/static/static-struct-with-option-8578.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8578 //@ check-pass #![allow(dead_code)] #![allow(non_camel_case_types)] diff --git a/tests/ui/issues/auxiliary/issue-8044.rs b/tests/ui/structs/auxiliary/aux-8044.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-8044.rs rename to tests/ui/structs/auxiliary/aux-8044.rs diff --git a/tests/ui/structs/btree-struct-usage-8044.rs b/tests/ui/structs/btree-struct-usage-8044.rs new file mode 100644 index 0000000000000..9b544f33f1c2d --- /dev/null +++ b/tests/ui/structs/btree-struct-usage-8044.rs @@ -0,0 +1,10 @@ +// https://github.com/rust-lang/rust/issues/8044 +//@ run-pass +//@ aux-build:aux-8044.rs + +extern crate aux_8044 as minimal; +use minimal::{BTree, leaf}; + +pub fn main() { + BTree:: { node: leaf(1) }; +} diff --git a/tests/ui/issues/issue-8783.rs b/tests/ui/structs/destructuring-struct-type-inference-8783.rs similarity index 88% rename from tests/ui/issues/issue-8783.rs rename to tests/ui/structs/destructuring-struct-type-inference-8783.rs index d0ff79f8ac800..60bc4bf3289e5 100644 --- a/tests/ui/issues/issue-8783.rs +++ b/tests/ui/structs/destructuring-struct-type-inference-8783.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8783 //@ run-pass #![allow(unused_variables)] diff --git a/tests/ui/issues/issue-6344-let.rs b/tests/ui/structs/destructuring-struct-with-dtor-6344-.rs similarity index 81% rename from tests/ui/issues/issue-6344-let.rs rename to tests/ui/structs/destructuring-struct-with-dtor-6344-.rs index 1e1bdfa17bed2..f96022b0f95c7 100644 --- a/tests/ui/issues/issue-6344-let.rs +++ b/tests/ui/structs/destructuring-struct-with-dtor-6344-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/6344- //@ run-pass #![allow(non_shorthand_field_patterns)] diff --git a/tests/ui/issues/issue-56835.rs b/tests/ui/structs/invalid-self-constructor-56835.rs similarity index 83% rename from tests/ui/issues/issue-56835.rs rename to tests/ui/structs/invalid-self-constructor-56835.rs index 7132d15ee5fbf..fd8763443f04a 100644 --- a/tests/ui/issues/issue-56835.rs +++ b/tests/ui/structs/invalid-self-constructor-56835.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/56835 pub struct Foo {} impl Foo { diff --git a/tests/ui/issues/issue-56835.stderr b/tests/ui/structs/invalid-self-constructor-56835.stderr similarity index 83% rename from tests/ui/issues/issue-56835.stderr rename to tests/ui/structs/invalid-self-constructor-56835.stderr index e949ae7b32402..045781ec42bd2 100644 --- a/tests/ui/issues/issue-56835.stderr +++ b/tests/ui/structs/invalid-self-constructor-56835.stderr @@ -1,11 +1,11 @@ error: the `Self` constructor can only be used with tuple or unit structs - --> $DIR/issue-56835.rs:4:12 + --> $DIR/invalid-self-constructor-56835.rs:5:12 | LL | fn bar(Self(foo): Self) {} | ^^^^^^^^^ help: use curly brackets: `Self { /* fields */ }` error[E0164]: expected tuple struct or tuple variant, found self constructor `Self` - --> $DIR/issue-56835.rs:4:12 + --> $DIR/invalid-self-constructor-56835.rs:5:12 | LL | fn bar(Self(foo): Self) {} | ^^^^^^^^^ not a tuple struct or tuple variant diff --git a/tests/ui/issues/issue-5439.rs b/tests/ui/structs/nonexistent-struct-field-error-5439.rs similarity index 86% rename from tests/ui/issues/issue-5439.rs rename to tests/ui/structs/nonexistent-struct-field-error-5439.rs index 852b264dc5dbf..b2b3293ac91ad 100644 --- a/tests/ui/issues/issue-5439.rs +++ b/tests/ui/structs/nonexistent-struct-field-error-5439.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5439 struct Foo { foo: isize, } diff --git a/tests/ui/issues/issue-5439.stderr b/tests/ui/structs/nonexistent-struct-field-error-5439.stderr similarity index 86% rename from tests/ui/issues/issue-5439.stderr rename to tests/ui/structs/nonexistent-struct-field-error-5439.stderr index 6d1d74e304558..b560772fbf042 100644 --- a/tests/ui/issues/issue-5439.stderr +++ b/tests/ui/structs/nonexistent-struct-field-error-5439.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `Foo` has no field named `nonexistent` - --> $DIR/issue-5439.rs:11:31 + --> $DIR/nonexistent-struct-field-error-5439.rs:12:31 | LL | return Box::new(Foo { nonexistent: self, foo: i }); | ^^^^^^^^^^^ `Foo` does not have this field diff --git a/tests/ui/issues/issue-7044.rs b/tests/ui/structs/unit-like-struct-masks-constant-7044.rs similarity index 65% rename from tests/ui/issues/issue-7044.rs rename to tests/ui/structs/unit-like-struct-masks-constant-7044.rs index a6e22bc5237ab..f48dd695f018e 100644 --- a/tests/ui/issues/issue-7044.rs +++ b/tests/ui/structs/unit-like-struct-masks-constant-7044.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7044 static X: isize = 0; struct X; //~ ERROR the name `X` is defined multiple times diff --git a/tests/ui/issues/issue-7044.stderr b/tests/ui/structs/unit-like-struct-masks-constant-7044.stderr similarity index 87% rename from tests/ui/issues/issue-7044.stderr rename to tests/ui/structs/unit-like-struct-masks-constant-7044.stderr index 9d1fb3a10ddd3..48aa6fce455a8 100644 --- a/tests/ui/issues/issue-7044.stderr +++ b/tests/ui/structs/unit-like-struct-masks-constant-7044.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `X` is defined multiple times - --> $DIR/issue-7044.rs:2:1 + --> $DIR/unit-like-struct-masks-constant-7044.rs:3:1 | LL | static X: isize = 0; | -------------------- previous definition of the value `X` here diff --git a/tests/ui/issues/issue-87707.rs b/tests/ui/sync/once-poisoning-behavior-87707.rs similarity index 87% rename from tests/ui/issues/issue-87707.rs rename to tests/ui/sync/once-poisoning-behavior-87707.rs index a0da8a740ac39..9b450943f5d7a 100644 --- a/tests/ui/issues/issue-87707.rs +++ b/tests/ui/sync/once-poisoning-behavior-87707.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/87707 // test for #87707 //@ edition:2018 //@ run-fail diff --git a/tests/ui/issues/issue-87707.run.stderr b/tests/ui/sync/once-poisoning-behavior-87707.run.stderr similarity index 50% rename from tests/ui/issues/issue-87707.run.stderr rename to tests/ui/sync/once-poisoning-behavior-87707.run.stderr index 8485c0578b82c..ad19f42ace906 100644 --- a/tests/ui/issues/issue-87707.run.stderr +++ b/tests/ui/sync/once-poisoning-behavior-87707.run.stderr @@ -1,7 +1,7 @@ -thread 'main' ($TID) panicked at $DIR/issue-87707.rs:14:24: +thread 'main' ($TID) panicked at $DIR/once-poisoning-behavior-87707.rs:15:24: Here Once instance is poisoned. note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace -thread 'main' ($TID) panicked at $DIR/issue-87707.rs:16:7: +thread 'main' ($TID) panicked at $DIR/once-poisoning-behavior-87707.rs:17:7: Once instance has previously been poisoned diff --git a/tests/ui/issues/issue-70673.rs b/tests/ui/thread-local/thread-local-static-reference-70673.rs similarity index 78% rename from tests/ui/issues/issue-70673.rs rename to tests/ui/thread-local/thread-local-static-reference-70673.rs index 3793ee7f58b70..bc4dabbb7fcde 100644 --- a/tests/ui/issues/issue-70673.rs +++ b/tests/ui/thread-local/thread-local-static-reference-70673.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/70673 // Regression test for https://github.com/rust-lang/rust/issues/70673. //@ run-pass diff --git a/tests/ui/issues/issue-59020.rs b/tests/ui/threads-sendsync/park-timeout-wakeup-59020.rs similarity index 92% rename from tests/ui/issues/issue-59020.rs rename to tests/ui/threads-sendsync/park-timeout-wakeup-59020.rs index 2a34ba52b8831..af530bb586c76 100644 --- a/tests/ui/issues/issue-59020.rs +++ b/tests/ui/threads-sendsync/park-timeout-wakeup-59020.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/59020 //@ edition:2018 //@ run-pass //@ needs-threads diff --git a/tests/ui/issues/issue-87199.rs b/tests/ui/trait-bounds/invalid-bound-modifier-87199.rs similarity index 94% rename from tests/ui/issues/issue-87199.rs rename to tests/ui/trait-bounds/invalid-bound-modifier-87199.rs index dd9dfc74ca352..f3baa4b1feb8d 100644 --- a/tests/ui/issues/issue-87199.rs +++ b/tests/ui/trait-bounds/invalid-bound-modifier-87199.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/87199 // Regression test for issue #87199, where attempting to relax a bound // other than the only supported `?Sized` would still cause the compiler // to assume that the `Sized` bound was relaxed. diff --git a/tests/ui/issues/issue-87199.stderr b/tests/ui/trait-bounds/invalid-bound-modifier-87199.stderr similarity index 82% rename from tests/ui/issues/issue-87199.stderr rename to tests/ui/trait-bounds/invalid-bound-modifier-87199.stderr index 8a930a3d704c1..692f2d469e656 100644 --- a/tests/ui/issues/issue-87199.stderr +++ b/tests/ui/trait-bounds/invalid-bound-modifier-87199.stderr @@ -1,23 +1,23 @@ error: bound modifier `?` can only be applied to `Sized` - --> $DIR/issue-87199.rs:8:11 + --> $DIR/invalid-bound-modifier-87199.rs:9:11 | LL | fn arg(_: T) {} | ^^^^^ error: bound modifier `?` can only be applied to `Sized` - --> $DIR/issue-87199.rs:10:15 + --> $DIR/invalid-bound-modifier-87199.rs:11:15 | LL | fn ref_arg(_: &T) {} | ^^^^^ error: bound modifier `?` can only be applied to `Sized` - --> $DIR/issue-87199.rs:12:40 + --> $DIR/invalid-bound-modifier-87199.rs:13:40 | LL | fn ret() -> impl Iterator + ?Send { std::iter::empty() } | ^^^^^ error: bound modifier `?` can only be applied to `Sized` - --> $DIR/issue-87199.rs:12:40 + --> $DIR/invalid-bound-modifier-87199.rs:13:40 | LL | fn ret() -> impl Iterator + ?Send { std::iter::empty() } | ^^^^^ @@ -25,14 +25,14 @@ LL | fn ret() -> impl Iterator + ?Send { std::iter::empty() } = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no` error[E0277]: the size for values of type `[i32]` cannot be known at compilation time - --> $DIR/issue-87199.rs:19:15 + --> $DIR/invalid-bound-modifier-87199.rs:20:15 | LL | ref_arg::<[i32]>(&[5]); | ^^^^^ doesn't have a size known at compile-time | = help: the trait `Sized` is not implemented for `[i32]` note: required by an implicit `Sized` bound in `ref_arg` - --> $DIR/issue-87199.rs:10:12 + --> $DIR/invalid-bound-modifier-87199.rs:11:12 | LL | fn ref_arg(_: &T) {} | ^ required by the implicit `Sized` requirement on this type parameter in `ref_arg` diff --git a/tests/ui/issues/issue-58857.rs b/tests/ui/trait-bounds/negative-bound-not-supported-58857.rs similarity index 71% rename from tests/ui/issues/issue-58857.rs rename to tests/ui/trait-bounds/negative-bound-not-supported-58857.rs index 4350d7e5b403b..0a0b70a216be6 100644 --- a/tests/ui/issues/issue-58857.rs +++ b/tests/ui/trait-bounds/negative-bound-not-supported-58857.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/58857 struct Conj {a : A} trait Valid {} diff --git a/tests/ui/issues/issue-58857.stderr b/tests/ui/trait-bounds/negative-bound-not-supported-58857.stderr similarity index 71% rename from tests/ui/issues/issue-58857.stderr rename to tests/ui/trait-bounds/negative-bound-not-supported-58857.stderr index ac70bc725e277..05347a891b4f1 100644 --- a/tests/ui/issues/issue-58857.stderr +++ b/tests/ui/trait-bounds/negative-bound-not-supported-58857.stderr @@ -1,5 +1,5 @@ error: negative bounds are not supported - --> $DIR/issue-58857.rs:4:9 + --> $DIR/negative-bound-not-supported-58857.rs:5:9 | LL | impl Conj{} | ^ diff --git a/tests/ui/issues/issue-5572.rs b/tests/ui/trait-bounds/partial-eq-trait-bound-5572.rs similarity index 67% rename from tests/ui/issues/issue-5572.rs rename to tests/ui/trait-bounds/partial-eq-trait-bound-5572.rs index f27744ef0ac7a..7ee0cdc43ee55 100644 --- a/tests/ui/issues/issue-5572.rs +++ b/tests/ui/trait-bounds/partial-eq-trait-bound-5572.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5572 //@ check-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-69455.rs b/tests/ui/trait-bounds/projection-predicate-not-satisfied-69455.rs similarity index 93% rename from tests/ui/issues/issue-69455.rs rename to tests/ui/trait-bounds/projection-predicate-not-satisfied-69455.rs index a53aadcfad024..8c165de462475 100644 --- a/tests/ui/issues/issue-69455.rs +++ b/tests/ui/trait-bounds/projection-predicate-not-satisfied-69455.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/69455 // Regression test for #69455: projection predicate was not satisfied. // Compiler should indicate the correct location of the // unsatisfied projection predicate diff --git a/tests/ui/issues/issue-69455.stderr b/tests/ui/trait-bounds/projection-predicate-not-satisfied-69455.stderr similarity index 88% rename from tests/ui/issues/issue-69455.stderr rename to tests/ui/trait-bounds/projection-predicate-not-satisfied-69455.stderr index d3e307fba2ce9..4b2f2f1bc5670 100644 --- a/tests/ui/issues/issue-69455.stderr +++ b/tests/ui/trait-bounds/projection-predicate-not-satisfied-69455.stderr @@ -1,5 +1,5 @@ error[E0284]: type annotations needed - --> $DIR/issue-69455.rs:29:41 + --> $DIR/projection-predicate-not-satisfied-69455.rs:30:41 | LL | println!("{}", 23u64.test(xs.iter().sum())); | ---- ^^^ cannot infer type of the type parameter `S` declared on the method `sum` @@ -13,7 +13,7 @@ LL | println!("{}", 23u64.test(xs.iter().sum::())); | +++++ error[E0283]: type annotations needed - --> $DIR/issue-69455.rs:29:41 + --> $DIR/projection-predicate-not-satisfied-69455.rs:30:41 | LL | println!("{}", 23u64.test(xs.iter().sum())); | ---- ^^^ cannot infer type of the type parameter `S` declared on the method `sum` @@ -21,7 +21,7 @@ LL | println!("{}", 23u64.test(xs.iter().sum())); | required by a bound introduced by this call | note: multiple `impl`s satisfying `u64: Test<_>` found - --> $DIR/issue-69455.rs:11:1 + --> $DIR/projection-predicate-not-satisfied-69455.rs:12:1 | LL | impl Test for u64 { | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-66353.rs b/tests/ui/traits/associated-type-ice-recovery-66353.rs similarity index 86% rename from tests/ui/issues/issue-66353.rs rename to tests/ui/traits/associated-type-ice-recovery-66353.rs index d8abdd5206ef4..472bc11108231 100644 --- a/tests/ui/issues/issue-66353.rs +++ b/tests/ui/traits/associated-type-ice-recovery-66353.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/66353 // #66353: ICE when trying to recover from incorrect associated type trait _Func { diff --git a/tests/ui/issues/issue-66353.stderr b/tests/ui/traits/associated-type-ice-recovery-66353.stderr similarity index 78% rename from tests/ui/issues/issue-66353.stderr rename to tests/ui/traits/associated-type-ice-recovery-66353.stderr index 7ab7547b42dc6..30740f66dcd90 100644 --- a/tests/ui/issues/issue-66353.stderr +++ b/tests/ui/traits/associated-type-ice-recovery-66353.stderr @@ -1,17 +1,17 @@ error[E0277]: the trait bound `(): _A` is not satisfied - --> $DIR/issue-66353.rs:12:15 + --> $DIR/associated-type-ice-recovery-66353.rs:13:15 | LL | _Func::< <() as _A>::AssocT >::func(()); | ^^ the trait `_A` is not implemented for `()` | help: this trait has no implementations, consider adding one - --> $DIR/issue-66353.rs:7:1 + --> $DIR/associated-type-ice-recovery-66353.rs:8:1 | LL | trait _A { | ^^^^^^^^ error[E0277]: the trait bound `(): _Func<_>` is not satisfied - --> $DIR/issue-66353.rs:12:41 + --> $DIR/associated-type-ice-recovery-66353.rs:13:41 | LL | _Func::< <() as _A>::AssocT >::func(()); | ----------------------------------- ^^ the trait `_Func<_>` is not implemented for `()` @@ -19,7 +19,7 @@ LL | _Func::< <() as _A>::AssocT >::func(()); | required by a bound introduced by this call | help: this trait has no implementations, consider adding one - --> $DIR/issue-66353.rs:3:1 + --> $DIR/associated-type-ice-recovery-66353.rs:4:1 | LL | trait _Func { | ^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/auxiliary/issue-9123.rs b/tests/ui/traits/auxiliary/aux-9123.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-9123.rs rename to tests/ui/traits/auxiliary/aux-9123.rs diff --git a/tests/ui/issues/issue-73229.rs b/tests/ui/traits/callback-trait-implementation-73229.rs similarity index 90% rename from tests/ui/issues/issue-73229.rs rename to tests/ui/traits/callback-trait-implementation-73229.rs index 6d5eec2365e5e..56bcf7acdcdf5 100644 --- a/tests/ui/issues/issue-73229.rs +++ b/tests/ui/traits/callback-trait-implementation-73229.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/73229 //@ check-pass fn any() -> T { diff --git a/tests/ui/traits/default-method-fn-call-9123.rs b/tests/ui/traits/default-method-fn-call-9123.rs new file mode 100644 index 0000000000000..266b95ca960c5 --- /dev/null +++ b/tests/ui/traits/default-method-fn-call-9123.rs @@ -0,0 +1,7 @@ +// https://github.com/rust-lang/rust/issues/9123 +//@ run-pass +//@ aux-build:aux-9123.rs + +extern crate aux_9123; + +pub fn main() {} diff --git a/tests/ui/issues/issue-86756.rs b/tests/ui/traits/duplicate-generic-parameter-error-86756.rs similarity index 89% rename from tests/ui/issues/issue-86756.rs rename to tests/ui/traits/duplicate-generic-parameter-error-86756.rs index 55a6c144839e8..acc281cb8c456 100644 --- a/tests/ui/issues/issue-86756.rs +++ b/tests/ui/traits/duplicate-generic-parameter-error-86756.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/86756 //@ edition: 2015 trait Foo {} //~^ ERROR the name `T` is already used for a generic parameter in this item's generic parameters diff --git a/tests/ui/issues/issue-86756.stderr b/tests/ui/traits/duplicate-generic-parameter-error-86756.stderr similarity index 82% rename from tests/ui/issues/issue-86756.stderr rename to tests/ui/traits/duplicate-generic-parameter-error-86756.stderr index b650b32c2a367..d4b2169ffd2dd 100644 --- a/tests/ui/issues/issue-86756.stderr +++ b/tests/ui/traits/duplicate-generic-parameter-error-86756.stderr @@ -1,5 +1,5 @@ error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters - --> $DIR/issue-86756.rs:2:14 + --> $DIR/duplicate-generic-parameter-error-86756.rs:3:14 | LL | trait Foo {} | - ^ already used @@ -7,13 +7,13 @@ LL | trait Foo {} | first use of `T` error[E0412]: cannot find type `dyn` in this scope - --> $DIR/issue-86756.rs:6:10 + --> $DIR/duplicate-generic-parameter-error-86756.rs:7:10 | LL | eq:: | ^^^ not found in this scope warning: trait objects without an explicit `dyn` are deprecated - --> $DIR/issue-86756.rs:6:15 + --> $DIR/duplicate-generic-parameter-error-86756.rs:7:15 | LL | eq:: | ^^^ @@ -27,13 +27,13 @@ LL | eq:: | +++ error[E0107]: missing generics for trait `Foo` - --> $DIR/issue-86756.rs:6:15 + --> $DIR/duplicate-generic-parameter-error-86756.rs:7:15 | LL | eq:: | ^^^ expected at least 1 generic argument | note: trait defined here, with at least 1 generic parameter: `T` - --> $DIR/issue-86756.rs:2:7 + --> $DIR/duplicate-generic-parameter-error-86756.rs:3:7 | LL | trait Foo {} | ^^^ - diff --git a/tests/ui/issues/issue-5666.rs b/tests/ui/traits/dynamic-dispatch-trait-objects-5666.rs similarity index 90% rename from tests/ui/issues/issue-5666.rs rename to tests/ui/traits/dynamic-dispatch-trait-objects-5666.rs index 76e2f8229a0f9..e335949d832da 100644 --- a/tests/ui/issues/issue-5666.rs +++ b/tests/ui/traits/dynamic-dispatch-trait-objects-5666.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5666 //@ run-pass struct Dog { @@ -14,7 +15,6 @@ impl Barks for Dog { } } - pub fn main() { let snoopy = Box::new(Dog{name: "snoopy".to_string()}); let bubbles = Box::new(Dog{name: "bubbles".to_string()}); diff --git a/tests/ui/issues/issue-58212.rs b/tests/ui/traits/generic-trait-impl-aliased-array-58212.rs similarity index 82% rename from tests/ui/issues/issue-58212.rs rename to tests/ui/traits/generic-trait-impl-aliased-array-58212.rs index f266db603bf1c..a71194ba80643 100644 --- a/tests/ui/issues/issue-58212.rs +++ b/tests/ui/traits/generic-trait-impl-aliased-array-58212.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/58212 //@ check-pass trait FromUnchecked { diff --git a/tests/ui/issues/issue-8249.rs b/tests/ui/traits/mut-trait-in-struct-8249.rs similarity index 80% rename from tests/ui/issues/issue-8249.rs rename to tests/ui/traits/mut-trait-in-struct-8249.rs index 2364fc14d31ac..b6dcd848b8b34 100644 --- a/tests/ui/issues/issue-8249.rs +++ b/tests/ui/traits/mut-trait-in-struct-8249.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8249 //@ run-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-53568.rs b/tests/ui/traits/nll-ice-custom-type-ops-53568.rs similarity index 93% rename from tests/ui/issues/issue-53568.rs rename to tests/ui/traits/nll-ice-custom-type-ops-53568.rs index 9862d4ced12c3..9b240cdc190d7 100644 --- a/tests/ui/issues/issue-53568.rs +++ b/tests/ui/traits/nll-ice-custom-type-ops-53568.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/53568 // Regression test for an NLL-related ICE (#53568) -- we failed to // resolve inference variables in "custom type-ops". // diff --git a/tests/ui/issues/issue-5883.rs b/tests/ui/traits/opaque-trait-size-error-5883.rs similarity index 81% rename from tests/ui/issues/issue-5883.rs rename to tests/ui/traits/opaque-trait-size-error-5883.rs index dd4753e0344a0..e39e24e734299 100644 --- a/tests/ui/issues/issue-5883.rs +++ b/tests/ui/traits/opaque-trait-size-error-5883.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5883 trait A {} struct Struct { diff --git a/tests/ui/issues/issue-5883.stderr b/tests/ui/traits/opaque-trait-size-error-5883.stderr similarity index 89% rename from tests/ui/issues/issue-5883.stderr rename to tests/ui/traits/opaque-trait-size-error-5883.stderr index 2ca437b8c4735..78de250b19a1e 100644 --- a/tests/ui/issues/issue-5883.stderr +++ b/tests/ui/traits/opaque-trait-size-error-5883.stderr @@ -1,19 +1,19 @@ error[E0277]: the size for values of type `(dyn A + 'static)` cannot be known at compilation time - --> $DIR/issue-5883.rs:9:6 + --> $DIR/opaque-trait-size-error-5883.rs:10:6 | LL | ) -> Struct { | ^^^^^^ doesn't have a size known at compile-time | = help: within `Struct`, the trait `Sized` is not implemented for `(dyn A + 'static)` note: required because it appears within the type `Struct` - --> $DIR/issue-5883.rs:3:8 + --> $DIR/opaque-trait-size-error-5883.rs:4:8 | LL | struct Struct { | ^^^^^^ = note: the return type of a function must have a statically known size error[E0277]: the size for values of type `(dyn A + 'static)` cannot be known at compilation time - --> $DIR/issue-5883.rs:8:8 + --> $DIR/opaque-trait-size-error-5883.rs:9:8 | LL | r: dyn A + 'static | ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/tests/ui/issues/issue-7673-cast-generically-implemented-trait.rs b/tests/ui/traits/polymorphic-trait-creation-7673-.rs similarity index 85% rename from tests/ui/issues/issue-7673-cast-generically-implemented-trait.rs rename to tests/ui/traits/polymorphic-trait-creation-7673-.rs index edba3284e3175..373a806230849 100644 --- a/tests/ui/issues/issue-7673-cast-generically-implemented-trait.rs +++ b/tests/ui/traits/polymorphic-trait-creation-7673-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7673- //@ check-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs b/tests/ui/traits/self-not-send-in-default-method-8171-.rs similarity index 84% rename from tests/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs rename to tests/ui/traits/self-not-send-in-default-method-8171-.rs index 6a03404cdca71..7f853c54f2e23 100644 --- a/tests/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs +++ b/tests/ui/traits/self-not-send-in-default-method-8171-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8171- //@ check-pass #![allow(dead_code)] diff --git a/tests/ui/issues/issue-69602-type-err-during-codegen-ice.rs b/tests/ui/traits/trait-implementation-ambiguity-69602-.rs similarity index 88% rename from tests/ui/issues/issue-69602-type-err-during-codegen-ice.rs rename to tests/ui/traits/trait-implementation-ambiguity-69602-.rs index 2c5257ce063cb..bc7f31c956f75 100644 --- a/tests/ui/issues/issue-69602-type-err-during-codegen-ice.rs +++ b/tests/ui/traits/trait-implementation-ambiguity-69602-.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/69602- trait TraitA { const VALUE: usize; } diff --git a/tests/ui/issues/issue-69602-type-err-during-codegen-ice.stderr b/tests/ui/traits/trait-implementation-ambiguity-69602-.stderr similarity index 81% rename from tests/ui/issues/issue-69602-type-err-during-codegen-ice.stderr rename to tests/ui/traits/trait-implementation-ambiguity-69602-.stderr index fa1d7dffbd49a..1430a628eaae4 100644 --- a/tests/ui/issues/issue-69602-type-err-during-codegen-ice.stderr +++ b/tests/ui/traits/trait-implementation-ambiguity-69602-.stderr @@ -1,11 +1,11 @@ error[E0437]: type `M` is not a member of trait `TraitB` - --> $DIR/issue-69602-type-err-during-codegen-ice.rs:17:5 + --> $DIR/trait-implementation-ambiguity-69602-.rs:18:5 | LL | type M = A; | ^^^^^^^^^^^^^ not a member of trait `TraitB` error[E0046]: not all trait items implemented, missing: `MyA` - --> $DIR/issue-69602-type-err-during-codegen-ice.rs:16:1 + --> $DIR/trait-implementation-ambiguity-69602-.rs:17:1 | LL | type MyA: TraitA; | ---------------- `MyA` from trait diff --git a/tests/ui/issues/issue-67535.rs b/tests/ui/traits/trait-implementation-for-non-local-types-67535.rs similarity index 92% rename from tests/ui/issues/issue-67535.rs rename to tests/ui/traits/trait-implementation-for-non-local-types-67535.rs index 24f50621310f1..198576ba5357d 100644 --- a/tests/ui/issues/issue-67535.rs +++ b/tests/ui/traits/trait-implementation-for-non-local-types-67535.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/67535 fn main() {} impl std::ops::AddAssign for () { diff --git a/tests/ui/issues/issue-67535.stderr b/tests/ui/traits/trait-implementation-for-non-local-types-67535.stderr similarity index 91% rename from tests/ui/issues/issue-67535.stderr rename to tests/ui/traits/trait-implementation-for-non-local-types-67535.stderr index 2afa2199a6afe..ef20f0c60ce19 100644 --- a/tests/ui/issues/issue-67535.stderr +++ b/tests/ui/traits/trait-implementation-for-non-local-types-67535.stderr @@ -1,5 +1,5 @@ error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/issue-67535.rs:3:1 + --> $DIR/trait-implementation-for-non-local-types-67535.rs:4:1 | LL | impl std::ops::AddAssign for () { | ^^^^^-------------------^^^^^-- @@ -12,7 +12,7 @@ LL | impl std::ops::AddAssign for () { = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/issue-67535.rs:10:1 + --> $DIR/trait-implementation-for-non-local-types-67535.rs:11:1 | LL | impl std::ops::AddAssign for [(); 1] { | ^^^^^-------------------^^^^^------- @@ -25,7 +25,7 @@ LL | impl std::ops::AddAssign for [(); 1] { = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/issue-67535.rs:17:1 + --> $DIR/trait-implementation-for-non-local-types-67535.rs:18:1 | LL | impl std::ops::AddAssign for &[u8] { | ^^^^^-------------------^^^^^----- diff --git a/tests/ui/issues/issue-6898.rs b/tests/ui/traits/trait-implementation-generic-access-6898.rs similarity index 93% rename from tests/ui/issues/issue-6898.rs rename to tests/ui/traits/trait-implementation-generic-access-6898.rs index c810acaf61baa..e9437b1c522e0 100644 --- a/tests/ui/issues/issue-6898.rs +++ b/tests/ui/traits/trait-implementation-generic-access-6898.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/6898 //@ check-pass use std::mem; diff --git a/tests/ui/issues/issue-5988.rs b/tests/ui/traits/trait-implementation-restriction-5988.rs similarity index 80% rename from tests/ui/issues/issue-5988.rs rename to tests/ui/traits/trait-implementation-restriction-5988.rs index b7527d9bea803..d3a5b10569b22 100644 --- a/tests/ui/issues/issue-5988.rs +++ b/tests/ui/traits/trait-implementation-restriction-5988.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/5988 //@ run-pass trait B { diff --git a/tests/ui/issues/issue-57156.rs b/tests/ui/traits/trait-object-lifetime-bounds-57156.rs similarity index 88% rename from tests/ui/issues/issue-57156.rs rename to tests/ui/traits/trait-object-lifetime-bounds-57156.rs index 12251509abd2d..8f5bef7fe13b9 100644 --- a/tests/ui/issues/issue-57156.rs +++ b/tests/ui/traits/trait-object-lifetime-bounds-57156.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57156 //@ check-pass trait Foo { diff --git a/tests/ui/issues/issue-7563.rs b/tests/ui/traits/trait-object-lifetime-bounds-7563.rs similarity index 91% rename from tests/ui/issues/issue-7563.rs rename to tests/ui/traits/trait-object-lifetime-bounds-7563.rs index 9ee8857b99960..8cfc7a14ffe66 100644 --- a/tests/ui/issues/issue-7563.rs +++ b/tests/ui/traits/trait-object-lifetime-bounds-7563.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7563 //@ run-pass #![allow(dead_code)] trait IDummy { diff --git a/tests/ui/issues/issue-56229.rs b/tests/ui/traits/trait-objects-with-supertraits-56229.rs similarity index 90% rename from tests/ui/issues/issue-56229.rs rename to tests/ui/traits/trait-objects-with-supertraits-56229.rs index 1c6dd72ed2dea..27cae968a6acd 100644 --- a/tests/ui/issues/issue-56229.rs +++ b/tests/ui/traits/trait-objects-with-supertraits-56229.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/56229 //@ check-pass trait Mirror { diff --git a/tests/ui/issues/issue-8767.rs b/tests/ui/typeck/impl-for-nonexistent-type-error-8767.rs similarity index 59% rename from tests/ui/issues/issue-8767.rs rename to tests/ui/typeck/impl-for-nonexistent-type-error-8767.rs index 972101a0bc3ee..005c676ed39b3 100644 --- a/tests/ui/issues/issue-8767.rs +++ b/tests/ui/typeck/impl-for-nonexistent-type-error-8767.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/8767 impl B { //~ ERROR cannot find type `B` in this scope } diff --git a/tests/ui/issues/issue-8767.stderr b/tests/ui/typeck/impl-for-nonexistent-type-error-8767.stderr similarity index 79% rename from tests/ui/issues/issue-8767.stderr rename to tests/ui/typeck/impl-for-nonexistent-type-error-8767.stderr index 66141628e28d2..0e37391a00f7b 100644 --- a/tests/ui/issues/issue-8767.stderr +++ b/tests/ui/typeck/impl-for-nonexistent-type-error-8767.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `B` in this scope - --> $DIR/issue-8767.rs:1:6 + --> $DIR/impl-for-nonexistent-type-error-8767.rs:2:6 | LL | impl B { | ^ not found in this scope diff --git a/tests/ui/issues/issue-57924.rs b/tests/ui/typeck/self-constructor-type-args-not-allowed-57924.rs similarity index 78% rename from tests/ui/issues/issue-57924.rs rename to tests/ui/typeck/self-constructor-type-args-not-allowed-57924.rs index 8846912a8ff79..2b3b11c3f380a 100644 --- a/tests/ui/issues/issue-57924.rs +++ b/tests/ui/typeck/self-constructor-type-args-not-allowed-57924.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/57924 pub struct Gcm(E); impl Gcm { diff --git a/tests/ui/issues/issue-57924.stderr b/tests/ui/typeck/self-constructor-type-args-not-allowed-57924.stderr similarity index 83% rename from tests/ui/issues/issue-57924.stderr rename to tests/ui/typeck/self-constructor-type-args-not-allowed-57924.stderr index 40435fd0f0a93..b5be5b39eb8fe 100644 --- a/tests/ui/issues/issue-57924.stderr +++ b/tests/ui/typeck/self-constructor-type-args-not-allowed-57924.stderr @@ -1,5 +1,5 @@ error[E0109]: type arguments are not allowed on self constructor - --> $DIR/issue-57924.rs:5:16 + --> $DIR/self-constructor-type-args-not-allowed-57924.rs:6:16 | LL | Self::(e) | ---- ^ type argument not allowed diff --git a/tests/ui/issues/issue-56199.rs b/tests/ui/typeck/self-constructor-type-error-56199.rs similarity index 91% rename from tests/ui/issues/issue-56199.rs rename to tests/ui/typeck/self-constructor-type-error-56199.rs index ba11582a9d591..b08d69189807a 100644 --- a/tests/ui/issues/issue-56199.rs +++ b/tests/ui/typeck/self-constructor-type-error-56199.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/56199 enum Foo {} struct Bar {} diff --git a/tests/ui/issues/issue-56199.stderr b/tests/ui/typeck/self-constructor-type-error-56199.stderr similarity index 79% rename from tests/ui/issues/issue-56199.stderr rename to tests/ui/typeck/self-constructor-type-error-56199.stderr index eb6d7005979f6..6e9d0fcd90c05 100644 --- a/tests/ui/issues/issue-56199.stderr +++ b/tests/ui/typeck/self-constructor-type-error-56199.stderr @@ -1,5 +1,5 @@ error: the `Self` constructor can only be used with tuple or unit structs - --> $DIR/issue-56199.rs:6:17 + --> $DIR/self-constructor-type-error-56199.rs:7:17 | LL | let _ = Self; | ^^^^ @@ -7,7 +7,7 @@ LL | let _ = Self; = help: did you mean to use one of the enum's variants? error: the `Self` constructor can only be used with tuple or unit structs - --> $DIR/issue-56199.rs:8:17 + --> $DIR/self-constructor-type-error-56199.rs:9:17 | LL | let _ = Self(); | ^^^^^^ @@ -15,13 +15,13 @@ LL | let _ = Self(); = help: did you mean to use one of the enum's variants? error: the `Self` constructor can only be used with tuple or unit structs - --> $DIR/issue-56199.rs:15:17 + --> $DIR/self-constructor-type-error-56199.rs:16:17 | LL | let _ = Self; | ^^^^ help: use curly brackets: `Self { /* fields */ }` error: the `Self` constructor can only be used with tuple or unit structs - --> $DIR/issue-56199.rs:17:17 + --> $DIR/self-constructor-type-error-56199.rs:18:17 | LL | let _ = Self(); | ^^^^^^ help: use curly brackets: `Self { /* fields */ }` diff --git a/tests/ui/issues/issue-60989.rs b/tests/ui/typeck/type-arguments-on-local-variable-60989.rs similarity index 86% rename from tests/ui/issues/issue-60989.rs rename to tests/ui/typeck/type-arguments-on-local-variable-60989.rs index 29db3fdb47104..134188754b4ce 100644 --- a/tests/ui/issues/issue-60989.rs +++ b/tests/ui/typeck/type-arguments-on-local-variable-60989.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/60989 struct A {} struct B {} diff --git a/tests/ui/issues/issue-60989.stderr b/tests/ui/typeck/type-arguments-on-local-variable-60989.stderr similarity index 80% rename from tests/ui/issues/issue-60989.stderr rename to tests/ui/typeck/type-arguments-on-local-variable-60989.stderr index e0236567b2fa6..20cb4752079a2 100644 --- a/tests/ui/issues/issue-60989.stderr +++ b/tests/ui/typeck/type-arguments-on-local-variable-60989.stderr @@ -1,5 +1,5 @@ error[E0109]: type arguments are not allowed on local variable - --> $DIR/issue-60989.rs:12:10 + --> $DIR/type-arguments-on-local-variable-60989.rs:13:10 | LL | c1::<()>; | -- ^^ type argument not allowed @@ -7,7 +7,7 @@ LL | c1::<()>; | not allowed on local variable error[E0109]: type arguments are not allowed on local variable - --> $DIR/issue-60989.rs:16:10 + --> $DIR/type-arguments-on-local-variable-60989.rs:17:10 | LL | c1::>; | -- ^^^^^^^^^^^ type argument not allowed diff --git a/tests/ui/issues/issue-69683.rs b/tests/ui/typeck/type-inference-for-associated-types-69683.rs similarity index 91% rename from tests/ui/issues/issue-69683.rs rename to tests/ui/typeck/type-inference-for-associated-types-69683.rs index 7a76e9ef205ff..f18adcae23b05 100644 --- a/tests/ui/issues/issue-69683.rs +++ b/tests/ui/typeck/type-inference-for-associated-types-69683.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/69683 pub trait Element { type Array; } diff --git a/tests/ui/issues/issue-69683.stderr b/tests/ui/typeck/type-inference-for-associated-types-69683.stderr similarity index 82% rename from tests/ui/issues/issue-69683.stderr rename to tests/ui/typeck/type-inference-for-associated-types-69683.stderr index b8e9e89e56eb9..5d49d442c55d0 100644 --- a/tests/ui/issues/issue-69683.stderr +++ b/tests/ui/typeck/type-inference-for-associated-types-69683.stderr @@ -1,5 +1,5 @@ error[E0284]: type annotations needed - --> $DIR/issue-69683.rs:30:10 + --> $DIR/type-inference-for-associated-types-69683.rs:31:10 | LL | 0u16.foo(b); | ^^^ @@ -12,13 +12,13 @@ LL + >::foo(0u16, b); | error[E0283]: type annotations needed - --> $DIR/issue-69683.rs:30:10 + --> $DIR/type-inference-for-associated-types-69683.rs:31:10 | LL | 0u16.foo(b); | ^^^ | note: multiple `impl`s satisfying `u8: Element<_>` found - --> $DIR/issue-69683.rs:5:1 + --> $DIR/type-inference-for-associated-types-69683.rs:6:1 | LL | impl Element<()> for T { | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -26,7 +26,7 @@ LL | impl Element<()> for T { LL | impl, S> Element<[S; 3]> for T { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: required by a bound in `Foo::foo` - --> $DIR/issue-69683.rs:15:9 + --> $DIR/type-inference-for-associated-types-69683.rs:16:9 | LL | u8: Element, | ^^^^^^^^^^ required by this bound in `Foo::foo` diff --git a/tests/ui/issues/issue-61894.rs b/tests/ui/typeck/type-name-intrinsic-usage-61894.rs similarity index 70% rename from tests/ui/issues/issue-61894.rs rename to tests/ui/typeck/type-name-intrinsic-usage-61894.rs index 40ad6a8d76a01..8131bb273909d 100644 --- a/tests/ui/issues/issue-61894.rs +++ b/tests/ui/typeck/type-name-intrinsic-usage-61894.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/61894 //@ run-pass #![feature(core_intrinsics)] @@ -17,5 +18,5 @@ impl Bar { } fn main() { - assert_eq!(Bar(()).foo(), "issue_61894::Bar<_>::foo::f"); + assert_eq!(Bar(()).foo(), "type_name_intrinsic_usage_61894::Bar<_>::foo::f"); } diff --git a/tests/ui/issues/issue-70746.rs b/tests/ui/unboxed-closures/callback-trait-prediction-70746.rs similarity index 91% rename from tests/ui/issues/issue-70746.rs rename to tests/ui/unboxed-closures/callback-trait-prediction-70746.rs index e7b4855039796..c0f0eb541e843 100644 --- a/tests/ui/issues/issue-70746.rs +++ b/tests/ui/unboxed-closures/callback-trait-prediction-70746.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/70746 //@ check-pass pub trait Trait1 { diff --git a/tests/ui/issues/issue-65462.rs b/tests/ui/union/union-field-access-error-65462.rs similarity index 80% rename from tests/ui/issues/issue-65462.rs rename to tests/ui/union/union-field-access-error-65462.rs index e148c8aeeb2b5..ead403bc526cd 100644 --- a/tests/ui/issues/issue-65462.rs +++ b/tests/ui/union/union-field-access-error-65462.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/65462 //@ build-pass enum Empty {} diff --git a/tests/ui/issues/issue-83048.rs b/tests/ui/unpretty/thir-tree-break-outside-loop-83048.rs similarity index 72% rename from tests/ui/issues/issue-83048.rs rename to tests/ui/unpretty/thir-tree-break-outside-loop-83048.rs index 6c941133a152c..6dcebd77c27b2 100644 --- a/tests/ui/issues/issue-83048.rs +++ b/tests/ui/unpretty/thir-tree-break-outside-loop-83048.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/83048 //@ compile-flags: -Z unpretty=thir-tree pub fn main() { diff --git a/tests/ui/issues/issue-83048.stderr b/tests/ui/unpretty/thir-tree-break-outside-loop-83048.stderr similarity index 82% rename from tests/ui/issues/issue-83048.stderr rename to tests/ui/unpretty/thir-tree-break-outside-loop-83048.stderr index 672bf69a7325b..72ae6ae2725cc 100644 --- a/tests/ui/issues/issue-83048.stderr +++ b/tests/ui/unpretty/thir-tree-break-outside-loop-83048.stderr @@ -1,5 +1,5 @@ error[E0268]: `break` outside of a loop or labeled block - --> $DIR/issue-83048.rs:4:5 + --> $DIR/thir-tree-break-outside-loop-83048.rs:5:5 | LL | break; | ^^^^^ cannot `break` outside of a loop or labeled block diff --git a/tests/ui/issues/issue-7344.rs b/tests/ui/unreachable-code/boolean-negation-in-unreachable-code-7344.rs similarity index 81% rename from tests/ui/issues/issue-7344.rs rename to tests/ui/unreachable-code/boolean-negation-in-unreachable-code-7344.rs index 406b24634f55e..8fd091872c310 100644 --- a/tests/ui/issues/issue-7344.rs +++ b/tests/ui/unreachable-code/boolean-negation-in-unreachable-code-7344.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/7344 //@ run-pass #![allow(unused_must_use)] diff --git a/tests/ui/issues/auxiliary/issue-5844-aux.rs b/tests/ui/unsafe/auxiliary/aux-5844.rs similarity index 100% rename from tests/ui/issues/auxiliary/issue-5844-aux.rs rename to tests/ui/unsafe/auxiliary/aux-5844.rs diff --git a/tests/ui/unsafe/extern-function-requires-unsafe-5844.rs b/tests/ui/unsafe/extern-function-requires-unsafe-5844.rs new file mode 100644 index 0000000000000..11863ce647ae1 --- /dev/null +++ b/tests/ui/unsafe/extern-function-requires-unsafe-5844.rs @@ -0,0 +1,8 @@ +// https://github.com/rust-lang/rust/issues/5844 +//@aux-build:aux-5844.rs + +extern crate aux_5844; + +fn main() { + aux_5844::rand(); //~ ERROR: requires unsafe +} diff --git a/tests/ui/issues/issue-5844.stderr b/tests/ui/unsafe/extern-function-requires-unsafe-5844.stderr similarity index 70% rename from tests/ui/issues/issue-5844.stderr rename to tests/ui/unsafe/extern-function-requires-unsafe-5844.stderr index bae917fa72c5d..44dee178991ae 100644 --- a/tests/ui/issues/issue-5844.stderr +++ b/tests/ui/unsafe/extern-function-requires-unsafe-5844.stderr @@ -1,8 +1,8 @@ error[E0133]: call to unsafe function `rand` is unsafe and requires unsafe function or block - --> $DIR/issue-5844.rs:6:5 + --> $DIR/extern-function-requires-unsafe-5844.rs:7:5 | -LL | issue_5844_aux::rand(); - | ^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function +LL | aux_5844::rand(); + | ^^^^^^^^^^^^^^^^ call to unsafe function | = note: consult the function's documentation for information on how to avoid undefined behavior