bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove span from delegate

Browse source
This commit is contained in:
Michael Goulet 2025-01-29 23:31:31 +00:00
parent 820bfffc25
commit fd1110ce6a
3 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_next_trait_solver/src/delegate.rs
View file

@ -11,8 +11,6 @@ pub trait SolverDelegate: Deref<Target = <Self as SolverDelegate>::Infcx> + Size
(**self).cx() (**self).cx()
} }
type Span: Copy;
fn build_with_canonical<V>( fn build_with_canonical<V>(
cx: Self::Interner, cx: Self::Interner,
canonical: &ty::CanonicalQueryInput<Self::Interner, V>, canonical: &ty::CanonicalQueryInput<Self::Interner, V>,
@ -23,7 +21,7 @@ pub trait SolverDelegate: Deref<Target = <Self as SolverDelegate>::Infcx> + Size
fn fresh_var_for_kind_with_span( fn fresh_var_for_kind_with_span(
&self, &self,
arg: <Self::Interner as Interner>::GenericArg, arg: <Self::Interner as Interner>::GenericArg,
span: Self::Span, span: <Self::Interner as Interner>::Span,
) -> <Self::Interner as Interner>::GenericArg; ) -> <Self::Interner as Interner>::GenericArg;
// FIXME: Uplift the leak check into this crate. // FIXME: Uplift the leak check into this crate.

2
compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs
View file

@ -431,7 +431,7 @@ where
// `rustc_trait_selection::solve::inspect::analyse`. // `rustc_trait_selection::solve::inspect::analyse`.
pub fn instantiate_canonical_state<D, I, T: TypeFoldable<I>>( pub fn instantiate_canonical_state<D, I, T: TypeFoldable<I>>(
delegate: &D, delegate: &D,
span: D::Span, span: I::Span,
param_env: I::ParamEnv, param_env: I::ParamEnv,
orig_values: &mut Vec<I::GenericArg>, orig_values: &mut Vec<I::GenericArg>,
state: inspect::CanonicalState<I, T>, state: inspect::CanonicalState<I, T>,

2
compiler/rustc_trait_selection/src/solve/delegate.rs
View file

@ -43,8 +43,6 @@ impl<'tcx> rustc_next_trait_solver::delegate::SolverDelegate for SolverDelegate<
self.0.tcx self.0.tcx
} }
type Span = Span;
fn build_with_canonical<V>( fn build_with_canonical<V>(
interner: TyCtxt<'tcx>, interner: TyCtxt<'tcx>,
canonical: &CanonicalQueryInput<'tcx, V>, canonical: &CanonicalQueryInput<'tcx, V>,