Give rustc_tools_util's host_compiler some love: serialize full rustc version, debug print, and test.

Author: ignatz

Cargo.toml

@@ -25,7 +25,7 @@ path = "src/driver.rs"
 [dependencies]
 clippy_config = { path = "clippy_config" }
 clippy_lints = { path = "clippy_lints" }
-rustc_tools_util = "0.4.0"
+rustc_tools_util = { path = "rustc_tools_util", version = "0.4.0" }
 tempfile = { version = "3.3", optional = true }
 termize = "0.1"
 color-print = "0.3.4"
@@ -54,7 +54,7 @@ parking_lot = "0.12"
 tokio = { version = "1", features = ["io-util"] }
 
 [build-dependencies]
-rustc_tools_util = "0.4.0"
+rustc_tools_util = { path = "rustc_tools_util", version = "0.4.0" }
 
 [features]
 integration = ["tempfile"]

rustc_tools_util/src/lib.rs

@@ -12,6 +12,7 @@ macro_rules! get_version_info {
         let patch = std::env!("CARGO_PKG_VERSION_PATCH").parse::<u16>().unwrap();
         let crate_name = String::from(std::env!("CARGO_PKG_NAME"));
 
+        let host_compiler_version = std::option_env!("RUSTC_VERSION").map(str::to_string);
         let host_compiler = std::option_env!("RUSTC_RELEASE_CHANNEL").map(str::to_string);
         let commit_hash = std::option_env!("GIT_HASH").map(str::to_string);
         let commit_date = std::option_env!("COMMIT_DATE").map(str::to_string);
@@ -20,6 +21,7 @@ macro_rules! get_version_info {
             major,
             minor,
             patch,
+            host_compiler_version,
             host_compiler,
             commit_hash,
             commit_date,
@@ -29,7 +31,7 @@ macro_rules! get_version_info {
 }
 
 /// This macro can be used in `build.rs` to automatically set the needed
-/// environment values, namely `GIT_HASH`, `COMMIT_DATE` and
+/// environment values, namely `GIT_HASH`, `COMMIT_DATE`, `RUSTC_VERSION` and
 /// `RUSTC_RELEASE_CHANNEL`
 #[macro_export]
 macro_rules! setup_version_info {
@@ -43,7 +45,15 @@ macro_rules! setup_version_info {
             "cargo:rustc-env=COMMIT_DATE={}",
             $crate::get_commit_date().unwrap_or_default()
         );
-        println!("cargo:rustc-env=RUSTC_RELEASE_CHANNEL={}", $crate::get_channel());
+        let compiler_version = $crate::get_compiler_version();
+        println!(
+            "cargo:rustc-env=RUSTC_VERSION={}",
+            compiler_version.as_deref().unwrap_or_default()
+        );
+        println!(
+            "cargo:rustc-env=RUSTC_RELEASE_CHANNEL={}",
+            $crate::get_channel(compiler_version)
+        );
     }};
 }
 
@@ -52,6 +62,7 @@ pub struct VersionInfo {
     pub major: u8,
     pub minor: u8,
     pub patch: u16,
+    pub host_compiler_version: Option<String>,
     pub host_compiler: Option<String>,
     pub commit_hash: Option<String>,
     pub commit_date: Option<String>,
@@ -87,16 +98,20 @@ impl std::fmt::Debug for VersionInfo {
             "VersionInfo {{ crate_name: \"{}\", major: {}, minor: {}, patch: {}",
             self.crate_name, self.major, self.minor, self.patch,
         )?;
-        if self.commit_hash.is_some() {
-            write!(
-                f,
-                ", commit_hash: \"{}\", commit_date: \"{}\" }}",
-                self.commit_hash.clone().unwrap_or_default().trim(),
-                self.commit_date.clone().unwrap_or_default().trim()
-            )?;
-        } else {
-            write!(f, " }}")?;
+        if let Some(ref commit_hash) = self.commit_hash {
+            write!(f, ", commit_hash: \"{}\"", commit_hash.trim(),)?;
         }
+        if let Some(ref commit_date) = self.commit_date {
+            write!(f, ", commit_date: \"{}\"", commit_date.trim())?;
+        }
+        if let Some(ref version) = self.host_compiler_version {
+            write!(f, ", host_compiler_version: \"{}\"", version.trim())?;
+        }
+        if let Some(ref host_compiler) = self.host_compiler {
+            write!(f, ", host_compiler: \"{}\"", host_compiler.trim())?;
+        }
+
+        write!(f, " }}")?;
 
         Ok(())
     }
@@ -152,13 +167,18 @@ pub fn get_commit_date() -> Option<String> {
 }
 
 #[must_use]
-pub fn get_channel() -> String {
+pub fn get_compiler_version() -> Option<String> {
+    get_output("rustc", &["-V"])
+}
+
+#[must_use]
+pub fn get_channel(compiler_version: Option<String>) -> String {
     if let Ok(channel) = std::env::var("CFG_RELEASE_CHANNEL") {
         return channel;
     }
 
     // if that failed, try to ask rustc -V, do some parsing and find out
-    if let Some(rustc_output) = get_output("rustc", &["-V"]) {
+    if let Some(rustc_output) = compiler_version {
         if rustc_output.contains("beta") {
             return String::from("beta");
         } else if rustc_output.contains("nightly") {
@@ -184,6 +204,8 @@ mod test {
         // hard to make positive tests for these since they will always change
         assert!(vi.commit_hash.is_none());
         assert!(vi.commit_date.is_none());
+
+        assert!(vi.host_compiler.is_none());
     }
 
     #[test]

tests/versioncheck.rs

@@ -90,3 +90,12 @@ fn check_that_clippy_has_the_same_major_version_as_rustc() {
         },
     }
 }
+
+#[test]
+fn check_host_compiler() {
+    let version = rustc_tools_util::get_version_info!();
+    assert_eq!(version.host_compiler, Some("nightly".to_string()));
+
+    let rustc_version = version.host_compiler_version.unwrap();
+    assert!(rustc_version.contains("nightly"));
+}