diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2025-07-11 13:45:33 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2025-07-11 14:22:23 +0200 |
| commit | d5b10f0c7e8db174b53cf09d2d2fe4c822447f9d (patch) | |
| tree | b0b124538b8a08ac5b6b12d14145a3208730fb74 | |
| parent | e2270bb9e582465099fbad550be13f6892339f42 (diff) | |
| download | rust-d5b10f0c7e8db174b53cf09d2d2fe4c822447f9d.tar.gz rust-d5b10f0c7e8db174b53cf09d2d2fe4c822447f9d.zip | |
Use `$RUSTC` instead of `rustc` to get version if var is available
| -rw-r--r-- | rustc_tools_util/src/lib.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rustc_tools_util/src/lib.rs b/rustc_tools_util/src/lib.rs index b45edf23455..194ed84d04c 100644 --- a/rustc_tools_util/src/lib.rs +++ b/rustc_tools_util/src/lib.rs @@ -157,7 +157,8 @@ pub fn get_commit_date() -> Option<String> { #[must_use] pub fn get_compiler_version() -> Option<String> { - get_output("rustc", &["-V"]) + let compiler = std::option_env!("RUSTC").unwrap_or("rustc"); + get_output(compiler, &["-V"]) } #[must_use] @@ -172,6 +173,8 @@ pub fn get_channel(compiler_version: Option<String>) -> String { return String::from("beta"); } else if rustc_output.contains("nightly") { return String::from("nightly"); + } else if rustc_output.contains("dev") { + return String::from("dev"); } } |