diff options
| author | lcnr <rust@lcnr.de> | 2024-09-30 10:19:00 +0200 | 
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2024-10-01 17:20:31 +0200 | 
| commit | a7b114420c70a1c0bc082d078d5284af6ff4af23 (patch) | |
| tree | e3b190fd99bf989a066b1cb0387a333eb6327d4a | |
| parent | 13881f5404037e25a88d0b79a836e232dc73b1fc (diff) | |
| download | rust-a7b114420c70a1c0bc082d078d5284af6ff4af23.tar.gz rust-a7b114420c70a1c0bc082d078d5284af6ff4af23.zip  | |
add tests
| -rw-r--r-- | tests/ui/traits/next-solver/overflow/coherence-alias-hang-with-region.rs | 30 | ||||
| -rw-r--r-- | tests/ui/traits/next-solver/overflow/coherence-alias-hang.rs (renamed from tests/ui/traits/coherence-alias-hang.rs) | 11 | ||||
| -rw-r--r-- | tests/ui/traits/next-solver/overflow/nalgebra-hang.rs | 35 | 
3 files changed, 74 insertions, 2 deletions
diff --git a/tests/ui/traits/next-solver/overflow/coherence-alias-hang-with-region.rs b/tests/ui/traits/next-solver/overflow/coherence-alias-hang-with-region.rs new file mode 100644 index 00000000000..4ade8a13ca9 --- /dev/null +++ b/tests/ui/traits/next-solver/overflow/coherence-alias-hang-with-region.rs @@ -0,0 +1,30 @@ +//@ check-pass +//@ revisions: ai ia ii +//@ compile-flags: -Znext-solver=coherence + +// Regression test for nalgebra hang <https://github.com/rust-lang/rust/issues/130056>. + +#![feature(lazy_type_alias)] +#![allow(incomplete_features)] + +type Id<T: ?Sized> = T; +trait NotImplemented {} + +struct W<'a, T: ?Sized, U: ?Sized>(&'a (), *const T, *const U); +trait Trait { + type Assoc: ?Sized; +} +impl<'a, T: ?Sized + Trait> Trait for W<'a, T, T> { + #[cfg(ai)] + type Assoc = W<'a, T::Assoc, Id<T::Assoc>>; + #[cfg(ia)] + type Assoc = W<'a, Id<T::Assoc>, T::Assoc>; + #[cfg(ii)] + type Assoc = W<'a, Id<T::Assoc>, Id<T::Assoc>>; +} + +trait Overlap<T: ?Sized> {} +impl<'a, T: ?Sized> Overlap<T> for W<'a, T, T> {} +impl<T: ?Sized + Trait + NotImplemented> Overlap<T::Assoc> for T {} + +fn main() {} diff --git a/tests/ui/traits/coherence-alias-hang.rs b/tests/ui/traits/next-solver/overflow/coherence-alias-hang.rs index c2b4d2e42d2..0d5f42231e4 100644 --- a/tests/ui/traits/coherence-alias-hang.rs +++ b/tests/ui/traits/next-solver/overflow/coherence-alias-hang.rs @@ -1,6 +1,8 @@ //@ check-pass -//@ revisions: current next -//[next]@ compile-flags: -Znext-solver +//@ revisions: ai_current ai_next ia_current ia_next ii_current ii_next +//@[ai_next] compile-flags: -Znext-solver +//@[ia_next] compile-flags: -Znext-solver +//@[ii_next] compile-flags: -Znext-solver // Regression test for nalgebra hang <https://github.com/rust-lang/rust/issues/130056>. @@ -15,7 +17,12 @@ trait Trait { type Assoc: ?Sized; } impl<T: ?Sized + Trait> Trait for W<T, T> { + #[cfg(any(ai_current, ai_next))] type Assoc = W<T::Assoc, Id<T::Assoc>>; + #[cfg(any(ia_current, ia_next))] + type Assoc = W<Id<T::Assoc>, T::Assoc>; + #[cfg(any(ii_current, ii_next))] + type Assoc = W<Id<T::Assoc>, Id<T::Assoc>>; } trait Overlap<T: ?Sized> {} diff --git a/tests/ui/traits/next-solver/overflow/nalgebra-hang.rs b/tests/ui/traits/next-solver/overflow/nalgebra-hang.rs new file mode 100644 index 00000000000..4bc6039c57d --- /dev/null +++ b/tests/ui/traits/next-solver/overflow/nalgebra-hang.rs @@ -0,0 +1,35 @@ +//@ check-pass +//@ revisions: current next +//@[next] compile-flags: -Znext-solver + +// Regression test for nalgebra hang from +// https://github.com/rust-lang/rust/pull/130654#issuecomment-2365465354 +trait HasAlias {} + +struct Dummy; +trait DummyTrait { + type DummyType<T: HasAlias>; +} +impl DummyTrait for Dummy { + type DummyType<T: HasAlias> = T; +} +type AliasOf<T> = <Dummy as DummyTrait>::DummyType<T>; + +struct Matrix<T, S>(T, S); +type OMatrix<T> = Matrix<T, AliasOf<T>>; + +impl<T: HasAlias> HasAlias for OMatrix<T> {} + +trait SimdValue { + type Element; +} +impl<T: HasAlias + SimdValue<Element: HasAlias>> SimdValue for OMatrix<T> { + type Element = OMatrix<T::Element>; +} + +trait Unimplemented {} +pub trait MyFrom<T> {} +impl<T: Unimplemented> MyFrom<T> for T {} +impl<T: SimdValue<Element: HasAlias>> MyFrom<T> for OMatrix<T::Element> {} + +fn main() {}  | 
