Bump version to 0.4.1 and remove HOST_COMPILER_VERSION for now, focusing on the release channel fix for now.

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 = { path = "rustc_tools_util", version = "0.4.0" }
+rustc_tools_util = { path = "rustc_tools_util", version = "0.4.1" }
 tempfile = { version = "3.3", optional = true }
 termize = "0.1"
 color-print = "0.3.4"

rustc_tools_util/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustc_tools_util"
-version = "0.4.0"
+version = "0.4.1"
 description = "small helper to generate version information for git packages"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"

rustc_tools_util/src/lib.rs

@@ -12,7 +12,6 @@ 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);
@@ -21,7 +20,6 @@ macro_rules! get_version_info {
             major,
             minor,
             patch,
-            host_compiler_version,
             host_compiler,
             commit_hash,
             commit_date,
@@ -30,9 +28,8 @@ 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`, `RUSTC_VERSION` and
-/// `RUSTC_RELEASE_CHANNEL`
+/// This macro can be used in `build.rs` to automatically set the needed environment values, namely `GIT_HASH`,
+/// `COMMIT_DATE`  and `RUSTC_RELEASE_CHANNEL`
 #[macro_export]
 macro_rules! setup_version_info {
     () => {{
@@ -46,10 +43,6 @@ macro_rules! setup_version_info {
             $crate::get_commit_date().unwrap_or_default()
         );
         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)
@@ -62,7 +55,6 @@ 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>,
@@ -104,9 +96,6 @@ impl std::fmt::Debug for VersionInfo {
         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())?;
         }

tests/versioncheck.rs

@@ -95,7 +95,4 @@ fn check_that_clippy_has_the_same_major_version_as_rustc() {
 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"));
 }