about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-12-19 16:20:22 +0000
committerbors <bors@rust-lang.org>2020-12-19 16:20:22 +0000
commit1b6b06a03a00a7c9f156bff130b72e90b79e1127 (patch)
treea7ba2f7bae11e111a56ff1970d37f1224caa1dd2 /src
parentbd2f1cb2785f87177249e2bdb628ed782fcd8def (diff)
parent3e31ffda973d2fe8e314378a98d0b4633fce9485 (diff)
downloadrust-1b6b06a03a00a7c9f156bff130b72e90b79e1127.tar.gz
rust-1b6b06a03a00a7c9f156bff130b72e90b79e1127.zip
Auto merge of #80132 - matthewjasper:revert-eval-order, r=nikomatsakis
Revert change to trait evaluation order

This change breaks some code and doesn't appear to enable any new code.

closes #79902

r? `@nikomatsakis`
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/traits/impl-evaluation-order.rs39
1 files changed, 39 insertions, 0 deletions
diff --git a/src/test/ui/traits/impl-evaluation-order.rs b/src/test/ui/traits/impl-evaluation-order.rs
new file mode 100644
index 00000000000..57809d89aa6
--- /dev/null
+++ b/src/test/ui/traits/impl-evaluation-order.rs
@@ -0,0 +1,39 @@
+// Regression test for #79902
+
+// Check that evaluation (which is used to determine whether to copy a type in
+// MIR building) evaluates bounds from normalizing an impl after evaluating
+// any bounds on the impl.
+
+// check-pass
+
+trait A {
+    type B;
+}
+trait M {}
+
+struct G<T, U>(*const T, *const U);
+
+impl<T, U> Clone for G<T, U> {
+    fn clone(&self) -> Self {
+        G { ..*self }
+    }
+}
+
+impl<T, U> Copy for G<T, U::B>
+where
+    T: A<B = U>,
+    U: A,
+{
+}
+
+impl A for () {
+    type B = ();
+}
+
+fn is_m<T: M>(_: T) {}
+
+fn main() {
+    let x = G(&(), &());
+    drop(x);
+    drop(x);
+}