diff options
| author | Matthew Jasper <mjjasper1@gmail.com> | 2020-12-17 20:16:10 +0000 |
|---|---|---|
| committer | Matthew Jasper <mjjasper1@gmail.com> | 2020-12-17 20:16:10 +0000 |
| commit | 3e31ffda973d2fe8e314378a98d0b4633fce9485 (patch) | |
| tree | 8ffb761bfc72004bc1c6dfc7b353d0a07c5e8e7c | |
| parent | d23e08448332425a84ae23124bea4dbd685536ce (diff) | |
| download | rust-3e31ffda973d2fe8e314378a98d0b4633fce9485.tar.gz rust-3e31ffda973d2fe8e314378a98d0b4633fce9485.zip | |
Revert change to evaluation order
This change breaks some code and doesn't appear to enable any new code.
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/select/confirmation.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/traits/impl-evaluation-order.rs | 39 |
2 files changed, 42 insertions, 3 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/select/confirmation.rs b/compiler/rustc_trait_selection/src/traits/select/confirmation.rs index ed22d5849e2..c40d781e17c 100644 --- a/compiler/rustc_trait_selection/src/traits/select/confirmation.rs +++ b/compiler/rustc_trait_selection/src/traits/select/confirmation.rs @@ -336,7 +336,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { fn vtable_impl( &mut self, impl_def_id: DefId, - mut substs: Normalized<'tcx, SubstsRef<'tcx>>, + substs: Normalized<'tcx, SubstsRef<'tcx>>, cause: ObligationCause<'tcx>, recursion_depth: usize, param_env: ty::ParamEnv<'tcx>, @@ -358,9 +358,9 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { // relying on projections in the impl-trait-ref. // // e.g., `impl<U: Tr, V: Iterator<Item=U>> Foo<<U as Tr>::T> for V` - substs.obligations.append(&mut impl_obligations); + impl_obligations.extend(substs.obligations); - ImplSourceUserDefinedData { impl_def_id, substs: substs.value, nested: substs.obligations } + ImplSourceUserDefinedData { impl_def_id, substs: substs.value, nested: impl_obligations } } fn confirm_object_candidate( 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); +} |
