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

don't return an Option from try_find_dep_kind

Browse source
This commit is contained in:
Martin Zacho 2025-01-07 21:57:00 +01:00
parent 45f198197b
commit 66c9a59a14
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -153,12 +153,7 @@ impl QueryContext for QueryCtxt<'_> {
}
fn depth_limit_error(self, job: QueryJobId) {
let mut span = None;
let mut note = None;
if let Some((info, depth)) = job.try_find_dep_kind_root(self.collect_active_jobs()) {
span = Some(info.job.span);
note = Some(QueryOverflowNote { desc: info.query.description, depth });
}
let (info, depth) = job.find_dep_kind_root(self.collect_active_jobs());
let suggested_limit = match self.recursion_limit() {
Limit(0) => Limit(2),
@ -166,8 +161,8 @@ impl QueryContext for QueryCtxt<'_> {
};
self.sess.dcx().emit_fatal(QueryOverflow {
span,
note,
span: info.job.span,
note: QueryOverflowNote { desc: info.query.description, depth },
suggested_limit,
crate_name: self.crate_name(LOCAL_CRATE),
});