bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rebase with master

Browse source
This commit is contained in:
hosseind75 2020-09-29 18:14:07 +03:30 • committed by hosseind88
parent 15663a432d
commit 2124e9b50e
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,11 +124,15 @@ impl<'tcx> TyCtxt<'tcx> {
})
}
<<<<<<< HEAD
pub fn try_print_query_stack(
handler: &Handler,
num_frames: Option<usize>,
backtrace: Option<bool>,
) {
=======
pub fn try_print_query_stack(handler: &Handler, num_frames: Option<usize>) {
>>>>>>> 15827338aa231fd408561bf5db8d8eea85d1a51a
eprintln!("query stack during panic:");
// Be careful reyling on global state here: this code is called from
@ -142,7 +146,11 @@ impl<'tcx> TyCtxt<'tcx> {
let mut i = 0;
while let Some(query) = current_query {
<<<<<<< HEAD
if backtrace.unwrap() == false && i == num_frames.unwrap() {
=======
if num_frames == Some(i) {
>>>>>>> 15827338aa231fd408561bf5db8d8eea85d1a51a
break;
}
let query_info =