bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove a redundant argument

Browse source
This commit is contained in:
Oli Scherer 2023-07-04 07:00:09 +00:00
parent 9227ff28af
commit d6b82ff761
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_query_system/src/query/plumbing.rs
View file

@ -126,18 +126,13 @@ where
#[cold] #[cold]
#[inline(never)] #[inline(never)]
fn mk_cycle<Q, Qcx>( fn mk_cycle<Q, Qcx>(query: Q, qcx: Qcx, cycle_error: CycleError<Qcx::DepKind>) -> Q::Value
query: Q,
qcx: Qcx,
cycle_error: CycleError<Qcx::DepKind>,
handler: HandleCycleError,
) -> Q::Value
where where
Q: QueryConfig<Qcx>, Q: QueryConfig<Qcx>,
Qcx: QueryContext, Qcx: QueryContext,
{ {
let error = report_cycle(qcx.dep_context().sess(), &cycle_error); let error = report_cycle(qcx.dep_context().sess(), &cycle_error);
handle_cycle_error(query, qcx, &cycle_error, error, handler) handle_cycle_error(query, qcx, &cycle_error, error)
} }
fn handle_cycle_error<Q, Qcx>( fn handle_cycle_error<Q, Qcx>(
@ -145,14 +140,13 @@ fn handle_cycle_error<Q, Qcx>(
qcx: Qcx, qcx: Qcx,
cycle_error: &CycleError<Qcx::DepKind>, cycle_error: &CycleError<Qcx::DepKind>,
mut error: DiagnosticBuilder<'_, ErrorGuaranteed>, mut error: DiagnosticBuilder<'_, ErrorGuaranteed>,
handler: HandleCycleError,
) -> Q::Value ) -> Q::Value
where where
Q: QueryConfig<Qcx>, Q: QueryConfig<Qcx>,
Qcx: QueryContext, Qcx: QueryContext,
{ {
use HandleCycleError::*; use HandleCycleError::*;
match handler { match query.handle_cycle_error() {
Error => { Error => {
error.emit(); error.emit();
query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle) query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
@ -277,7 +271,7 @@ where
&qcx.current_query_job(), &qcx.current_query_job(),
span, span,
); );
(mk_cycle(query, qcx, error, query.handle_cycle_error()), None) (mk_cycle(query, qcx, error), None)
} }
#[inline(always)] #[inline(always)]
@ -314,7 +308,7 @@ where
(v, Some(index)) (v, Some(index))
} }
Err(cycle) => (mk_cycle(query, qcx, cycle, query.handle_cycle_error()), None), Err(cycle) => (mk_cycle(query, qcx, cycle), None),
} }
} }