From b2c0fd087682c7cd61dbf44f02cefd28b0d230ed Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Sun, 21 Apr 2019 15:19:53 -0700 Subject: [PATCH] Remove redundant code in copy_clone_conditions This was left over from when closure copy and clone were gated behind feature flags. --- src/librustc/traits/select.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs index e7cc9618080c..cf69885c3e07 100644 --- a/src/librustc/traits/select.rs +++ b/src/librustc/traits/select.rs @@ -2505,16 +2505,10 @@ fn copy_clone_conditions( } 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(..) => {