about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2019-04-21 15:19:53 -0700
committerTyler Mandry <tmandry@gmail.com>2019-04-22 14:52:38 -0700
commitb2c0fd087682c7cd61dbf44f02cefd28b0d230ed (patch)
tree7bb40929d4b6afda7914546f6de8bc6ab86d57a3
parent6d599337fa7047307ba72786bbabe6b9c9e4daac (diff)
downloadrust-b2c0fd087682c7cd61dbf44f02cefd28b0d230ed.tar.gz
rust-b2c0fd087682c7cd61dbf44f02cefd28b0d230ed.zip
Remove redundant code in copy_clone_conditions
This was left over from when closure copy and clone were gated behind
feature flags.
-rw-r--r--src/librustc/traits/select.rs14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
index e7cc9618080..cf69885c3e0 100644
--- a/src/librustc/traits/select.rs
+++ b/src/librustc/traits/select.rs
@@ -2505,16 +2505,10 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
             }
 
             ty::Closure(def_id, substs) => {
-                let trait_id = obligation.predicate.def_id();
-                let is_copy_trait = Some(trait_id) == self.tcx().lang_items().copy_trait();
-                let is_clone_trait = Some(trait_id) == self.tcx().lang_items().clone_trait();
-                if is_copy_trait || is_clone_trait {
-                    Where(ty::Binder::bind(
-                        substs.upvar_tys(def_id, self.tcx()).collect(),
-                    ))
-                } else {
-                    None
-                }
+                // (*) binder moved here
+                Where(ty::Binder::bind(
+                    substs.upvar_tys(def_id, self.tcx()).collect(),
+                ))
             }
 
             ty::Adt(..) | ty::Projection(..) | ty::Param(..) | ty::Opaque(..) => {