about summary refs log tree commit diff
diff options
context:
space:
mode:
authorlcnr <rust@lcnr.de>2024-11-26 13:49:23 +0100
committerlcnr <rust@lcnr.de>2024-11-26 13:49:23 +0100
commit7dae9ac852fbb51b8d658eb838f1993c6cafa178 (patch)
treeffd1a639514722063008582cb66a7af220846791
parentf2abf827c128120ed7a874d02973947968c158b8 (diff)
downloadrust-7dae9ac852fbb51b8d658eb838f1993c6cafa178.tar.gz
rust-7dae9ac852fbb51b8d658eb838f1993c6cafa178.zip
add test for alias-bound shadowing, rename folder
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/alias-bound-shadowed-by-env.rs19
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/ambig-env-no-shadow.rs (renamed from tests/ui/traits/next-solver/env-shadows-impls/ambig-env-no-shadow.rs)0
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-1.rs (renamed from tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-1.rs)0
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-2.rs (renamed from tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-2.rs)0
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-3.rs (renamed from tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-3.rs)0
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/normalizes_to_ignores_unnormalizable_candidate.rs (renamed from tests/ui/traits/next-solver/env-shadows-impls/normalizes_to_ignores_unnormalizable_candidate.rs)0
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/normalizes_to_ignores_unnormalizable_candidate.stderr (renamed from tests/ui/traits/next-solver/env-shadows-impls/normalizes_to_ignores_unnormalizable_candidate.stderr)0
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/param-candidate-shadows-project.rs (renamed from tests/ui/traits/next-solver/env-shadows-impls/param-candidate-shadows-project.rs)0
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/param-candidate-shadows-project.stderr (renamed from tests/ui/traits/next-solver/env-shadows-impls/param-candidate-shadows-project.stderr)0
-rw-r--r--tests/ui/traits/next-solver/normalization-shadowing/param-env-impl-conflict.rs (renamed from tests/ui/traits/next-solver/env-shadows-impls/param-env-impl-conflict.rs)0
10 files changed, 19 insertions, 0 deletions
diff --git a/tests/ui/traits/next-solver/normalization-shadowing/alias-bound-shadowed-by-env.rs b/tests/ui/traits/next-solver/normalization-shadowing/alias-bound-shadowed-by-env.rs
new file mode 100644
index 00000000000..c0b169abcd5
--- /dev/null
+++ b/tests/ui/traits/next-solver/normalization-shadowing/alias-bound-shadowed-by-env.rs
@@ -0,0 +1,19 @@
+//@ compile-flags: -Znext-solver
+//@ check-pass
+
+trait Super {
+    type Assoc;
+}
+trait Bound {
+    type Assoc: Super<Assoc = u32>;
+}
+trait Trait: Super {}
+
+// Elaborating the environment results in a `T::Assoc: Super` where-bound.
+// This where-bound must not prevent normalization via the `Super<Assoc = u32>`
+// item bound.
+fn heck<T: Bound<Assoc: Trait>>(x: <T::Assoc as Super>::Assoc) -> u32 {
+    x
+}
+
+fn main() {}
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/ambig-env-no-shadow.rs b/tests/ui/traits/next-solver/normalization-shadowing/ambig-env-no-shadow.rs
index 362f911c144..362f911c144 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/ambig-env-no-shadow.rs
+++ b/tests/ui/traits/next-solver/normalization-shadowing/ambig-env-no-shadow.rs
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-1.rs b/tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-1.rs
index ce2d6304875..ce2d6304875 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-1.rs
+++ b/tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-1.rs
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-2.rs b/tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-2.rs
index 20329f467db..20329f467db 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-2.rs
+++ b/tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-2.rs
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-3.rs b/tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-3.rs
index da6f2908ab1..da6f2908ab1 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/discard-impls-shadowed-by-env-3.rs
+++ b/tests/ui/traits/next-solver/normalization-shadowing/discard-impls-shadowed-by-env-3.rs
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/normalizes_to_ignores_unnormalizable_candidate.rs b/tests/ui/traits/next-solver/normalization-shadowing/normalizes_to_ignores_unnormalizable_candidate.rs
index e66d1c485f8..e66d1c485f8 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/normalizes_to_ignores_unnormalizable_candidate.rs
+++ b/tests/ui/traits/next-solver/normalization-shadowing/normalizes_to_ignores_unnormalizable_candidate.rs
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/normalizes_to_ignores_unnormalizable_candidate.stderr b/tests/ui/traits/next-solver/normalization-shadowing/normalizes_to_ignores_unnormalizable_candidate.stderr
index 36d281e11dd..36d281e11dd 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/normalizes_to_ignores_unnormalizable_candidate.stderr
+++ b/tests/ui/traits/next-solver/normalization-shadowing/normalizes_to_ignores_unnormalizable_candidate.stderr
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/param-candidate-shadows-project.rs b/tests/ui/traits/next-solver/normalization-shadowing/param-candidate-shadows-project.rs
index d11150ca55a..d11150ca55a 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/param-candidate-shadows-project.rs
+++ b/tests/ui/traits/next-solver/normalization-shadowing/param-candidate-shadows-project.rs
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/param-candidate-shadows-project.stderr b/tests/ui/traits/next-solver/normalization-shadowing/param-candidate-shadows-project.stderr
index 0c72fc25dca..0c72fc25dca 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/param-candidate-shadows-project.stderr
+++ b/tests/ui/traits/next-solver/normalization-shadowing/param-candidate-shadows-project.stderr
diff --git a/tests/ui/traits/next-solver/env-shadows-impls/param-env-impl-conflict.rs b/tests/ui/traits/next-solver/normalization-shadowing/param-env-impl-conflict.rs
index 1b9e9866cd6..1b9e9866cd6 100644
--- a/tests/ui/traits/next-solver/env-shadows-impls/param-env-impl-conflict.rs
+++ b/tests/ui/traits/next-solver/normalization-shadowing/param-env-impl-conflict.rs