rebase with master

This commit is contained in:
hosseind75 2020-09-29 18:14:07 +03:30 committed by hosseind88
parent 7f07577e6f
commit 3c94914f0c

View File

@ -277,7 +277,9 @@ fn report_clippy_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
// If backtraces are enabled, also print the query stack
let backtrace = env::var_os("RUST_BACKTRACE").map_or(false, |x| &x != "0");
TyCtxt::try_print_query_stack(&handler, Some(2), Some(backtrace));
let num_frames = if backtrace { None } else { Some(2) };
TyCtxt::try_print_query_stack(&handler, num_frames);
}
fn toolchain_path(home: Option<String>, toolchain: Option<String>) -> Option<PathBuf> {