diff --git a/tests/ui/issues/issue-35139.rs b/tests/ui/associated-types/unconstrained-dyn-assoc-type-lifetime.rs similarity index 85% rename from tests/ui/issues/issue-35139.rs rename to tests/ui/associated-types/unconstrained-dyn-assoc-type-lifetime.rs index e462f35437358..bce0a3729a820 100644 --- a/tests/ui/issues/issue-35139.rs +++ b/tests/ui/associated-types/unconstrained-dyn-assoc-type-lifetime.rs @@ -1,3 +1,5 @@ +//! Regression test for . + use std::fmt; pub trait MethodType { diff --git a/tests/ui/issues/issue-35139.stderr b/tests/ui/associated-types/unconstrained-dyn-assoc-type-lifetime.stderr similarity index 89% rename from tests/ui/issues/issue-35139.stderr rename to tests/ui/associated-types/unconstrained-dyn-assoc-type-lifetime.stderr index 4568b9b70f412..73663e85ef37c 100644 --- a/tests/ui/issues/issue-35139.stderr +++ b/tests/ui/associated-types/unconstrained-dyn-assoc-type-lifetime.stderr @@ -1,5 +1,5 @@ error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait, self type, or predicates - --> $DIR/issue-35139.rs:9:6 + --> $DIR/unconstrained-dyn-assoc-type-lifetime.rs:11:6 | LL | impl<'a> MethodType for MTFn { | ^^ unconstrained lifetime parameter diff --git a/tests/ui/issues/issue-34334.rs b/tests/ui/binding/tuple-binder-on-err-ty.rs similarity index 64% rename from tests/ui/issues/issue-34334.rs rename to tests/ui/binding/tuple-binder-on-err-ty.rs index 51486bc40de0c..3357dd42f4e35 100644 --- a/tests/ui/issues/issue-34334.rs +++ b/tests/ui/binding/tuple-binder-on-err-ty.rs @@ -1,3 +1,6 @@ +//! Regression test for . +//! Test tuple pattern syntax doesn't ICE on erroneous type. + fn main () { let sr: Vec<(u32, _, _) = vec![]; //~^ ERROR expected one of diff --git a/tests/ui/issues/issue-34334.stderr b/tests/ui/binding/tuple-binder-on-err-ty.stderr similarity index 93% rename from tests/ui/issues/issue-34334.stderr rename to tests/ui/binding/tuple-binder-on-err-ty.stderr index 6bf6732311fcf..f8f9cd73035d6 100644 --- a/tests/ui/issues/issue-34334.stderr +++ b/tests/ui/binding/tuple-binder-on-err-ty.stderr @@ -1,5 +1,5 @@ error: expected one of `,`, `:`, or `>`, found `=` - --> $DIR/issue-34334.rs:2:29 + --> $DIR/tuple-binder-on-err-ty.rs:5:29 | LL | let sr: Vec<(u32, _, _) = vec![]; | - ^ expected one of `,`, `:`, or `>` @@ -12,7 +12,7 @@ LL | let sr: Vec<(u32, _, _)> = vec![]; | + error[E0277]: a value of type `Vec<(u32, _, _)>` cannot be built from an iterator over elements of type `()` - --> $DIR/issue-34334.rs:5:87 + --> $DIR/tuple-binder-on-err-ty.rs:8:87 | LL | let sr2: Vec<(u32, _, _)> = sr.iter().map(|(faction, th_sender, th_receiver)| {}).collect(); | ^^^^^^^ value of type `Vec<(u32, _, _)>` cannot be built from `std::iter::Iterator` @@ -22,7 +22,7 @@ help: the trait `FromIterator<()>` is not implemented for `Vec<(u32, _, _)>` --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL = help: for that trait implementation, expected `(u32, _, _)`, found `()` note: the method call chain might not have had the expected associated types - --> $DIR/issue-34334.rs:5:43 + --> $DIR/tuple-binder-on-err-ty.rs:8:43 | LL | let sr: Vec<(u32, _, _) = vec![]; | ------ this expression has type `Vec<(_, _, _)>` diff --git a/tests/ui/errors/error-count.rs b/tests/ui/errors/error-count.rs new file mode 100644 index 0000000000000..08eb56bc2040d --- /dev/null +++ b/tests/ui/errors/error-count.rs @@ -0,0 +1,9 @@ +//! Regression test for . +//! Test rustc emits right error count. +//! (this used to return `aborting due to 2 previous errors`) + +fn main() { + a; //~ ERROR cannot find value `a` + "".lorem; //~ ERROR no field + "".ipsum; //~ ERROR no field +} diff --git a/tests/ui/issues/issue-33525.stderr b/tests/ui/errors/error-count.stderr similarity index 84% rename from tests/ui/issues/issue-33525.stderr rename to tests/ui/errors/error-count.stderr index ee9f4d4c3016d..e53c2c5882c47 100644 --- a/tests/ui/issues/issue-33525.stderr +++ b/tests/ui/errors/error-count.stderr @@ -1,17 +1,17 @@ error[E0425]: cannot find value `a` in this scope - --> $DIR/issue-33525.rs:2:5 + --> $DIR/error-count.rs:6:5 | LL | a; | ^ not found in this scope error[E0609]: no field `lorem` on type `&'static str` - --> $DIR/issue-33525.rs:3:8 + --> $DIR/error-count.rs:7:8 | LL | "".lorem; | ^^^^^ unknown field error[E0609]: no field `ipsum` on type `&'static str` - --> $DIR/issue-33525.rs:4:8 + --> $DIR/error-count.rs:8:8 | LL | "".ipsum; | ^^^^^ unknown field diff --git a/tests/ui/issues/issue-34373.rs b/tests/ui/generics/cyclic-default-type-param-via-alias.rs similarity index 64% rename from tests/ui/issues/issue-34373.rs rename to tests/ui/generics/cyclic-default-type-param-via-alias.rs index 02e1048e5a330..ae83dfc7c6f74 100644 --- a/tests/ui/issues/issue-34373.rs +++ b/tests/ui/generics/cyclic-default-type-param-via-alias.rs @@ -1,3 +1,6 @@ +//! Regression test for . +//! Test cyclic default type param through alias doesn't ICE. + #![allow(warnings)] //@ ignore-parallel-frontend query cycle trait Trait { diff --git a/tests/ui/issues/issue-34373.stderr b/tests/ui/generics/cyclic-default-type-param-via-alias.stderr similarity index 82% rename from tests/ui/issues/issue-34373.stderr rename to tests/ui/generics/cyclic-default-type-param-via-alias.stderr index 9f85e4d5e5a93..4d05d45286529 100644 --- a/tests/ui/issues/issue-34373.stderr +++ b/tests/ui/generics/cyclic-default-type-param-via-alias.stderr @@ -1,17 +1,17 @@ error[E0391]: cycle detected when computing type of `Foo::T` - --> $DIR/issue-34373.rs:7:34 + --> $DIR/cyclic-default-type-param-via-alias.rs:10:34 | LL | pub struct Foo>>; | ^^^^^^^^^^ | note: ...which requires expanding type alias `DefaultFoo`... - --> $DIR/issue-34373.rs:9:19 + --> $DIR/cyclic-default-type-param-via-alias.rs:12:19 | LL | type DefaultFoo = Foo; | ^^^ = note: ...which again requires computing type of `Foo::T`, completing the cycle note: cycle used when checking that `Foo` is well-formed - --> $DIR/issue-34373.rs:7:1 + --> $DIR/cyclic-default-type-param-via-alias.rs:10:1 | LL | pub struct Foo>>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/issues/issue-33504.rs b/tests/ui/issues/issue-33504.rs deleted file mode 100644 index 89cc06ede5e48..0000000000000 --- a/tests/ui/issues/issue-33504.rs +++ /dev/null @@ -1,9 +0,0 @@ -// Shadowing a unit-like enum in a closure - -struct Test; - -fn main() { - || { - let Test = 1; //~ ERROR mismatched types - }; -} diff --git a/tests/ui/issues/issue-33525.rs b/tests/ui/issues/issue-33525.rs deleted file mode 100644 index 74f21eff20f69..0000000000000 --- a/tests/ui/issues/issue-33525.rs +++ /dev/null @@ -1,5 +0,0 @@ -fn main() { - a; //~ ERROR cannot find value `a` - "".lorem; //~ ERROR no field - "".ipsum; //~ ERROR no field -} diff --git a/tests/ui/issues/issue-34751.rs b/tests/ui/issues/issue-34751.rs deleted file mode 100644 index 1e842049b14c1..0000000000000 --- a/tests/ui/issues/issue-34751.rs +++ /dev/null @@ -1,11 +0,0 @@ -//@ check-pass -#![allow(dead_code)] -// #34751 ICE: 'rustc' panicked at 'assertion failed: !substs.has_regions_escaping_depth(0)' - -#[allow(dead_code)] - -use std::marker::PhantomData; - -fn f<'a>(PhantomData::<&'a u8>: PhantomData<&'a u8>) {} - -fn main() {} diff --git a/tests/ui/issues/issue-33941.current.stderr b/tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.current.stderr similarity index 88% rename from tests/ui/issues/issue-33941.current.stderr rename to tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.current.stderr index d653bbd327427..9ceacdc7bfbdd 100644 --- a/tests/ui/issues/issue-33941.current.stderr +++ b/tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.current.stderr @@ -1,5 +1,5 @@ error[E0271]: expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)` - --> $DIR/issue-33941.rs:9:36 + --> $DIR/cloned-hashmap-iter-type-mismatch-diag.rs:12:36 | LL | for _ in HashMap::new().iter().cloned() {} | ^^^^^^ expected `&_`, found `(&_, &_)` @@ -7,7 +7,7 @@ LL | for _ in HashMap::new().iter().cloned() {} = note: expected reference `&_` found tuple `(&_, &_)` note: the method call chain might not have had the expected associated types - --> $DIR/issue-33941.rs:9:29 + --> $DIR/cloned-hashmap-iter-type-mismatch-diag.rs:12:29 | LL | for _ in HashMap::new().iter().cloned() {} | -------------- ^^^^^^ `Iterator::Item` is `(&_, &_)` here @@ -17,7 +17,7 @@ note: required by a bound in `cloned` --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL error[E0271]: expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)` - --> $DIR/issue-33941.rs:9:14 + --> $DIR/cloned-hashmap-iter-type-mismatch-diag.rs:12:14 | LL | for _ in HashMap::new().iter().cloned() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&_`, found `(&_, &_)` diff --git a/tests/ui/issues/issue-33941.next.stderr b/tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.next.stderr similarity index 88% rename from tests/ui/issues/issue-33941.next.stderr rename to tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.next.stderr index d653bbd327427..9ceacdc7bfbdd 100644 --- a/tests/ui/issues/issue-33941.next.stderr +++ b/tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.next.stderr @@ -1,5 +1,5 @@ error[E0271]: expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)` - --> $DIR/issue-33941.rs:9:36 + --> $DIR/cloned-hashmap-iter-type-mismatch-diag.rs:12:36 | LL | for _ in HashMap::new().iter().cloned() {} | ^^^^^^ expected `&_`, found `(&_, &_)` @@ -7,7 +7,7 @@ LL | for _ in HashMap::new().iter().cloned() {} = note: expected reference `&_` found tuple `(&_, &_)` note: the method call chain might not have had the expected associated types - --> $DIR/issue-33941.rs:9:29 + --> $DIR/cloned-hashmap-iter-type-mismatch-diag.rs:12:29 | LL | for _ in HashMap::new().iter().cloned() {} | -------------- ^^^^^^ `Iterator::Item` is `(&_, &_)` here @@ -17,7 +17,7 @@ note: required by a bound in `cloned` --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL error[E0271]: expected `Iter<'_, _, _>` to be an iterator that yields `&_`, but it yields `(&_, &_)` - --> $DIR/issue-33941.rs:9:14 + --> $DIR/cloned-hashmap-iter-type-mismatch-diag.rs:12:14 | LL | for _ in HashMap::new().iter().cloned() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&_`, found `(&_, &_)` diff --git a/tests/ui/issues/issue-33941.rs b/tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.rs similarity index 77% rename from tests/ui/issues/issue-33941.rs rename to tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.rs index e49efc3bfd496..de402fbb7fba5 100644 --- a/tests/ui/issues/issue-33941.rs +++ b/tests/ui/iterators/cloned-hashmap-iter-type-mismatch-diag.rs @@ -1,3 +1,6 @@ +//! Regression test for . +//! Test iterator type mismatch prints pretty error message. +//! This used to emit many duplicated, unhelpful error messages. //@ revisions: current next //@ ignore-compare-mode-next-solver (explicit revisions) //@[next] compile-flags: -Znext-solver diff --git a/tests/ui/lifetimes/lifetime-in-unit-struct-pattern.rs b/tests/ui/lifetimes/lifetime-in-unit-struct-pattern.rs new file mode 100644 index 0000000000000..b9eebc8dac0f2 --- /dev/null +++ b/tests/ui/lifetimes/lifetime-in-unit-struct-pattern.rs @@ -0,0 +1,12 @@ +//! Regression test for . +//! This used to ICE with +//! `assertion failed: !substs.has_regions_escaping_depth(0)`. +//@ check-pass + +#![allow(dead_code)] + +use std::marker::PhantomData; + +fn f<'a>(PhantomData::<&'a u8>: PhantomData<&'a u8>) {} + +fn main() {} diff --git a/tests/ui/issues/issue-35423.rs b/tests/ui/match/range-arm-and-ref-arm.rs similarity index 70% rename from tests/ui/issues/issue-35423.rs rename to tests/ui/match/range-arm-and-ref-arm.rs index c43d35fea7837..d5a797aa1aaeb 100644 --- a/tests/ui/issues/issue-35423.rs +++ b/tests/ui/match/range-arm-and-ref-arm.rs @@ -1,4 +1,7 @@ +//! Regression test for . +//! This used to ICE. //@ run-pass + fn main () { let x = 4; match x { diff --git a/tests/ui/shadowed/shadow-unit-struct-in-closure.rs b/tests/ui/shadowed/shadow-unit-struct-in-closure.rs new file mode 100644 index 0000000000000..355c5f3c9f8d7 --- /dev/null +++ b/tests/ui/shadowed/shadow-unit-struct-in-closure.rs @@ -0,0 +1,10 @@ +//! Regression test for . +//! Test shadowing a unit-like struct in a closure doesn't cause ICE. + +struct Test; + +fn main() { + || { + let Test = 1; //~ ERROR mismatched types + }; +} diff --git a/tests/ui/issues/issue-33504.stderr b/tests/ui/shadowed/shadow-unit-struct-in-closure.stderr similarity index 91% rename from tests/ui/issues/issue-33504.stderr rename to tests/ui/shadowed/shadow-unit-struct-in-closure.stderr index e5a2eea751d0e..44845135c1deb 100644 --- a/tests/ui/issues/issue-33504.stderr +++ b/tests/ui/shadowed/shadow-unit-struct-in-closure.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-33504.rs:7:13 + --> $DIR/shadow-unit-struct-in-closure.rs:8:13 | LL | struct Test; | ----------- unit struct defined here diff --git a/tests/ui/issues/issue-3447.rs b/tests/ui/structs-enums/generic-recursive-list-struct.rs similarity index 84% rename from tests/ui/issues/issue-3447.rs rename to tests/ui/structs-enums/generic-recursive-list-struct.rs index ab844b0bb9061..f91cffecaa675 100644 --- a/tests/ui/issues/issue-3447.rs +++ b/tests/ui/structs-enums/generic-recursive-list-struct.rs @@ -1,4 +1,7 @@ +//! Regression test for . +//! This used to overflow stack. //@ run-pass + #![allow(dead_code)] #![allow(non_snake_case)] #![allow(non_camel_case_types)] diff --git a/tests/ui/issues/issue-33770.rs b/tests/ui/threads-sendsync/no-double-lock-same-thread.rs similarity index 84% rename from tests/ui/issues/issue-33770.rs rename to tests/ui/threads-sendsync/no-double-lock-same-thread.rs index 814e8f371765e..278ff0242950e 100644 --- a/tests/ui/issues/issue-33770.rs +++ b/tests/ui/threads-sendsync/no-double-lock-same-thread.rs @@ -1,3 +1,13 @@ +//! Regression test for . +//! Ensure both `Mutex` and `RwLock` cannot be locked twice on same +//! thread. +//! +//! This was possible as mutexes were initialized with `PTHREAD_MUTEX_DEFAULT` +//! for which attempt to relock from the same thread is considered undefined +//! behaviour, and during glibc's lock-elision transaction lock appeared +//! unlocked, which allowed to lock it again from the same thread. +//! +//! This resulted in ability to aquire 2 mutable references at the same time. //@ run-pass //@ needs-subprocess