rebase with master

hosseind75 · hosseind88 · commit 3c94914f0c87 · 2020-10-09T20:57:45.000+03:30
diff --git a/src/driver.rs b/src/driver.rs
@@ -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> {

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