Merge #2230

2230: Use autocfg to determine rust version r=matklad a=kjeremy

Fixes #2229 

Co-authored-by: kjeremy <[email protected]>

3 files changed, 12 insertions, 25 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 3fa6e931c..97452951c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1823,6 +1823,7 @@ dependencies = [
 name = "xtask"
 version = "0.1.0"
 dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 023f6a859..72b39c3b4 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -6,6 +6,7 @@ authors = ["rust-analyzer developers"]
 publish = false
 
 [dependencies]
+autocfg = "0.1"
 walkdir = "2.1.3"
 pico-args = "0.3.0"
 quote = "1.0.2"
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index c46eaa407..576ba003a 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -9,17 +9,18 @@
 //! `.cargo/config`.
 mod help;
 
+use autocfg;
 use core::fmt::Write;
 use core::str;
 use pico_args::Arguments;
 use std::{env, path::PathBuf};
 use xtask::{
     codegen::{self, Mode},
-    install_format_hook, run, run_clippy, run_fuzzer, run_rustfmt, run_with_output, Cmd, Result,
+    install_format_hook, run, run_clippy, run_fuzzer, run_rustfmt, Cmd, Result,
 };
 
 // Latest stable, feel free to send a PR if this lags behind.
-const REQUIRED_RUST_VERSION: u32 = 39;
+const REQUIRED_RUST_VERSION: (usize, usize) = (1, 39);
 
 struct InstallOpt {
     client: Option<ClientOpt>,
@@ -226,20 +227,14 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
 }
 
 fn install_server(opts: ServerOpt) -> Result<()> {
-    let mut old_rust = false;
-    if let Ok(output) = run_with_output("cargo --version", ".") {
-        if let Ok(stdout) = String::from_utf8(output.stdout) {
-            println!("{}", stdout);
-            if !check_version(&stdout, REQUIRED_RUST_VERSION) {
-                old_rust = true;
-            }
-        }
-    }
+    let ac = autocfg::AutoCfg::with_dir("target")?;
+
+    let old_rust = !ac.probe_rustc_version(REQUIRED_RUST_VERSION.0, REQUIRED_RUST_VERSION.1);
 
     if old_rust {
         eprintln!(
-            "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
-            REQUIRED_RUST_VERSION
+            "\nWARNING: at least rust {}.{}.0 is required to compile rust-analyzer\n",
+            REQUIRED_RUST_VERSION.0, REQUIRED_RUST_VERSION.1
         )
     }
 
@@ -251,20 +246,10 @@ fn install_server(opts: ServerOpt) -> Result<()> {
 
     if res.is_err() && old_rust {
         eprintln!(
-            "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
-            REQUIRED_RUST_VERSION
+            "\nWARNING: at least rust {}.{}.0 is required to compile rust-analyzer\n",
+            REQUIRED_RUST_VERSION.0, REQUIRED_RUST_VERSION.1
         )
     }
 
     res
 }
-
-fn check_version(version_output: &str, min_minor_version: u32) -> bool {
-    // Parse second the number out of
-    //      cargo 1.39.0-beta (1c6ec66d5 2019-09-30)
-    let minor: Option<u32> = version_output.split('.').nth(1).and_then(|it| it.parse().ok());
-    match minor {
-        None => true,
-        Some(minor) => minor >= min_minor_version,
-    }
-}