From 071f737a571c2931f9d1a338cd6eb52c5e4bc488 Mon Sep 17 00:00:00 2001 From: Maybe Waffle Date: Wed, 26 Apr 2023 10:38:54 +0000 Subject: [PATCH] Remove some more useless `ty::Binder::dummy` calls --- compiler/rustc_hir_typeck/src/coercion.rs | 4 ++-- compiler/rustc_trait_selection/src/solve/project_goals.rs | 4 ++-- .../src/traits/select/confirmation.rs | 7 ++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/compiler/rustc_hir_typeck/src/coercion.rs b/compiler/rustc_hir_typeck/src/coercion.rs index af1d61cd0ac..17952c601d2 100644 --- a/compiler/rustc_hir_typeck/src/coercion.rs +++ b/compiler/rustc_hir_typeck/src/coercion.rs @@ -764,11 +764,11 @@ fn coerce_dyn_star( self.tcx, self.cause.clone(), self.param_env, - ty::Binder::dummy(ty::TraitRef::from_lang_item( + ty::TraitRef::from_lang_item( self.tcx.at(self.cause.span), hir::LangItem::PointerLike, [a], - )), + ), )); Ok(InferOk { diff --git a/compiler/rustc_trait_selection/src/solve/project_goals.rs b/compiler/rustc_trait_selection/src/solve/project_goals.rs index a5dc17f9f85..bc5bb2e0c48 100644 --- a/compiler/rustc_trait_selection/src/solve/project_goals.rs +++ b/compiler/rustc_trait_selection/src/solve/project_goals.rs @@ -334,11 +334,11 @@ fn consider_builtin_pointee_candidate( ty::Alias(_, _) | ty::Param(_) | ty::Placeholder(..) => { // FIXME(ptr_metadata): It would also be possible to return a `Ok(Ambig)` with no constraints. - let sized_predicate = ty::Binder::dummy(ty::TraitRef::from_lang_item( + let sized_predicate = ty::TraitRef::from_lang_item( tcx.at(DUMMY_SP), LangItem::Sized, [ty::GenericArg::from(goal.predicate.self_ty())], - )); + ); ecx.add_goal(goal.with(tcx, sized_predicate)); tcx.types.unit } diff --git a/compiler/rustc_trait_selection/src/traits/select/confirmation.rs b/compiler/rustc_trait_selection/src/traits/select/confirmation.rs index 94197a1609e..6604b1aceff 100644 --- a/compiler/rustc_trait_selection/src/traits/select/confirmation.rs +++ b/compiler/rustc_trait_selection/src/traits/select/confirmation.rs @@ -646,11 +646,8 @@ fn confirm_fn_pointer_candidate( output_ty, &mut nested, ); - let tr = ty::Binder::dummy(ty::TraitRef::from_lang_item( - self.tcx().at(cause.span), - LangItem::Sized, - [output_ty], - )); + let tr = + ty::TraitRef::from_lang_item(self.tcx().at(cause.span), LangItem::Sized, [output_ty]); nested.push(Obligation::new(self.infcx.tcx, cause, obligation.param_env, tr)); Ok(ImplSourceFnPointerData { fn_ty: self_ty, nested })