From 33867834bc98de003683d0b7632bbb004c2aacff Mon Sep 17 00:00:00 2001 From: r01and Date: Wed, 27 Dec 2023 07:33:43 +0000 Subject: [PATCH] Remove dead codes --- compiler/rustc_infer/src/infer/relate/combine.rs | 8 ++------ compiler/rustc_infer/src/infer/relate/generalize.rs | 11 ----------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/compiler/rustc_infer/src/infer/relate/combine.rs b/compiler/rustc_infer/src/infer/relate/combine.rs index 6d8384e7a47..8b31a1118cb 100644 --- a/compiler/rustc_infer/src/infer/relate/combine.rs +++ b/compiler/rustc_infer/src/infer/relate/combine.rs @@ -335,7 +335,7 @@ fn unify_const_variable( // constants and generic expressions are not yet handled correctly. let Generalization { value_may_be_infer: value, needs_wf: _ } = generalize::generalize( self, - &mut CombineDelegate { infcx: self, span, param_env }, + &mut CombineDelegate { infcx: self, span }, ct, target_vid, ty::Variance::Invariant, @@ -454,11 +454,7 @@ pub fn instantiate( // adding constraints like `'x: '?2` and `?1 <: ?3`.) let Generalization { value_may_be_infer: b_ty, needs_wf } = generalize::generalize( self.infcx, - &mut CombineDelegate { - infcx: self.infcx, - param_env: self.param_env, - span: self.trace.span(), - }, + &mut CombineDelegate { infcx: self.infcx, span: self.trace.span() }, a_ty, b_vid, ambient_variance, diff --git a/compiler/rustc_infer/src/infer/relate/generalize.rs b/compiler/rustc_infer/src/infer/relate/generalize.rs index 665af7381dc..4d8c691ea3d 100644 --- a/compiler/rustc_infer/src/infer/relate/generalize.rs +++ b/compiler/rustc_infer/src/infer/relate/generalize.rs @@ -55,8 +55,6 @@ pub fn generalize<'tcx, D: GeneralizerDelegate<'tcx>, T: Into> + Rela /// Abstracts the handling of region vars between HIR and MIR/NLL typechecking /// in the generalizer code. pub trait GeneralizerDelegate<'tcx> { - fn param_env(&self) -> ty::ParamEnv<'tcx>; - fn forbid_inference_vars() -> bool; fn span(&self) -> Span; @@ -66,15 +64,10 @@ pub trait GeneralizerDelegate<'tcx> { pub struct CombineDelegate<'cx, 'tcx> { pub infcx: &'cx InferCtxt<'tcx>, - pub param_env: ty::ParamEnv<'tcx>, pub span: Span, } impl<'tcx> GeneralizerDelegate<'tcx> for CombineDelegate<'_, 'tcx> { - fn param_env(&self) -> ty::ParamEnv<'tcx> { - self.param_env - } - fn forbid_inference_vars() -> bool { false } @@ -95,10 +88,6 @@ impl<'tcx, T> GeneralizerDelegate<'tcx> for T where T: TypeRelatingDelegate<'tcx>, { - fn param_env(&self) -> ty::ParamEnv<'tcx> { - >::param_env(self) - } - fn forbid_inference_vars() -> bool { >::forbid_inference_vars() }