bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Address comments

Browse source
This commit is contained in:
John Kåre Alsaker 2023-03-26 12:24:44 +02:00
parent 453e919c37
commit 6d99dd9189
6 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_query_system/src/query/config.rs
View file

@ -47,7 +47,8 @@ pub trait QueryConfig<Qcx: QueryContext>: Copy {
fn loadable_from_disk(self, qcx: Qcx, key: &Self::Key, idx: SerializedDepNodeIndex) -> bool;
fn from_cycle_error(
/// Synthesize an error value to let compilation continue after a cycle.
fn value_from_cycle_error(
self,
tcx: Qcx::DepContext,
cycle: &[QueryInfo<Qcx::DepKind>],

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

@ -148,7 +148,7 @@ where
match handler {
Error => {
error.emit();
query.from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
}
Fatal => {
error.emit();
@ -157,7 +157,7 @@ where
}
DelayBug => {
error.delay_as_bug();
query.from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
}
}
}