nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 09:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

change condition for end of query stack message

Browse Source
This commit is contained in:
hosseind88 2020-10-08 21:07:12 +03:30
parent 42ebae3175
commit 73d8f0045f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_middle/src/ty/query/plumbing.rs
View File

@ -130,12 +130,12 @@ impl<'tcx> TyCtxt<'tcx> {
// Be careful reyling on global state here: this code is called from
// a panic hook, which means that the global `Handler` may be in a weird
// state if it was responsible for triggering the panic.
let mut i = 0;
ty::tls::with_context_opt(|icx| {
if let Some(icx) = icx {
let query_map = icx.tcx.queries.try_collect_active_jobs();
let mut current_query = icx.query;
let mut i = 0;
while let Some(query) = current_query {
if Some(i) == num_frames {
@ -166,10 +166,10 @@ impl<'tcx> TyCtxt<'tcx> {
}
});
if num_frames != None {
eprintln!("we're just showing a limited slice of the query stack");
} else {
if num_frames == None || num_frames >= Some(i) {
eprintln!("end of query stack");
} else {
eprintln!("we're just showing a limited slice of the query stack");
}
}
}