Merge pull request #76 from klensy/rustc_version

replace version_check with rustc_version

Author: Kobzol

Cargo.lock

@@ -40,4 +40,4 @@ rustc-demangle = "0.1"
 walkdir = "2.5"
 shellwords = "1.1"
 blake3 = "1.4"
-version_check = "0.9"
+rustc_version = "0.4.1"

Cargo.toml

@@ -72,7 +72,7 @@ pub fn cargo_command_with_rustflags(
     // values from .cargo/config.toml.
 
     // The `--config` flag is only supported in Rust 1.63+.
-    let supports_config_flag = version_check::is_min_version("1.63.0").unwrap_or(false);
+    let supports_config_flag = rustc_version::version()? >= semver::Version::new(1, 63, 0);
     let serialized_rustflags = rustflags.join(" ");
 
     let mut final_cargo_args = vec![];

src/build.rs

@@ -1,11 +1,11 @@
 use crate::bolt::env::{find_llvm_bolt, find_merge_fdata};
 use crate::bolt::llvm_bolt_install_hint;
 use crate::cli::cli_format_path;
-use crate::get_rustc_version;
 use crate::pgo::env::find_pgo_env;
 use crate::pgo::llvm_profdata_install_hint;
 use anyhow::anyhow;
 use colored::Colorize;
+use rustc_version;
 use std::path::PathBuf;
 
 /// Check that binaries required for performing PGO and BOLT can be found.
@@ -23,7 +23,7 @@ pub fn environment_info() -> anyhow::Result<()> {
 }
 
 fn check_rustc_version() -> bool {
-    match get_rustc_version() {
+    match rustc_version::version() {
         Ok(version) => {
             if version >= semver::Version::new(1, 39, 0) {
                 println!(

src/check.rs

@@ -12,7 +12,6 @@ pub mod pgo;
 pub(crate) mod utils;
 pub(crate) mod workspace;
 
-use anyhow::anyhow;
 use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
 use std::process::{Command, ExitStatus};
@@ -68,28 +67,7 @@ fn run_command<S: AsRef<OsStr>, Str: AsRef<OsStr>>(
 
 /// Tries to find the default target triple used for compiling on the current host computer.
 pub fn get_default_target() -> anyhow::Result<String> {
-    get_rustc_info("host: ")
-}
-
-pub fn get_rustc_version() -> anyhow::Result<semver::Version> {
-    let version = get_rustc_info("release: ")?;
-    let version = semver::Version::parse(&version)?;
-    Ok(version)
-}
-
-fn get_rustc_info(field: &str) -> anyhow::Result<String> {
-    // Query rustc for defaults.
-    let output = run_command("rustc", &["-vV"])?;
-
-    // Parse the field from stdout.
-    let host = output
-        .stdout
-        .lines()
-        .find(|l| l.starts_with(field))
-        .map(|l| l[field.len()..].trim())
-        .ok_or_else(|| anyhow!("Failed to parse field {} from rustc output.", field))?
-        .to_owned();
-    Ok(host)
+    Ok(rustc_version::version_meta()?.host)
 }
 
 /// Clears all files from the directory, and recreates it.

src/lib.rs

@@ -233,7 +233,7 @@ fn test_respect_target_dir() -> anyhow::Result<()> {
 
 #[test]
 fn test_respect_profile() -> anyhow::Result<()> {
-    if !version_check::is_min_version("1.57.0").unwrap_or(false) {
+    if !(rustc_version::version()? >= semver::Version::new(1, 57, 0)) {
         println!("Skipping test_respect_profile because of too old rustc");
         return Ok(());
     }
@@ -284,7 +284,7 @@ fn test_respect_existing_rustflags() -> anyhow::Result<()> {
 /// This only works for Rust 1.63+.
 #[test]
 fn test_override_build_rustflags_from_config() -> anyhow::Result<()> {
-    if !version_check::is_min_version("1.63.0").unwrap_or(false) {
+    if !(rustc_version::version()? >= semver::Version::new(1, 63, 0)) {
         return Ok(());
     }
 
@@ -308,7 +308,7 @@ rustflags = ["-Ctarget-cpu=native"]
 
 #[test]
 fn test_respect_existing_target_rustflags_from_config() -> anyhow::Result<()> {
-    if !version_check::is_min_version("1.63.0").unwrap_or(false) {
+    if !(rustc_version::version()? >= semver::Version::new(1, 63, 0)) {
         return Ok(());
     }