Use Clippy version in ICE message

rust-lang · Sep 27, 2019 · 38b0d74 · 38b0d74
1 parent 4992033
commit 38b0d74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/driver.rs b/src/driver.rs
@@ -288,10 +288,12 @@ fn report_clippy_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
         handler.abort_if_errors_and_should_abort();
     }
 
+    let version_info = rustc_tools_util::get_version_info!();
+
     let xs: Vec<Cow<'static, str>> = vec![
         "the compiler unexpectedly panicked. this is a bug.".into(),
         format!("we would appreciate a bug report: {}", bug_report_url).into(),
-        format!("rustc {}", option_env!("CFG_VERSION").unwrap_or("unknown_version")).into(),
+        format!("Clippy version: {}", version_info).into(),
     ];
 
     for note in &xs {

diff --git a/tests/ui/custom_ice_message.stderr b/tests/ui/custom_ice_message.stderr
@@ -7,5 +7,5 @@ note: the compiler unexpectedly panicked. this is a bug.
 
 note: we would appreciate a bug report: https://github.com/rust-lang/rust-clippy/issues/new
 
-note: rustc unknown_version
+note: Clippy version: clippy 0.0.212 (68ff8b19 2019-09-26)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,5 +7,5 @@ note: the compiler unexpectedly panicked. this is a bug.

		note: we would appreciate a bug report: https://github.com/rust-lang/rust-clippy/issues/new

		note: rustc unknown_version
		note: Clippy version: clippy 0.0.212 (68ff8b19 2019-09-26)