Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert #2230

Browse source 
Looks like autocfg tries to do slightly more than we need (see #2231),
so let's stick with minimal home-grown solution.
This commit is contained in:
Aleksey Kladov 2019-11-14 11:11:32 +03:00
parent 8af85263f7
commit c65f42325f
3 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1829,7 +1829,6 @@ name = "xtask"
version = "0.1.0"
dependencies = [
"anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
"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)",

1
xtask/Cargo.toml
View file

@ -6,7 +6,6 @@ authors = ["rust-analyzer developers"]
publish = false
[dependencies]
autocfg = "0.1"
walkdir = "2.1.3"
pico-args = "0.3.0"
quote = "1.0.2"

36
xtask/src/main.rs
View file

@ -10,18 +10,17 @@
mod help;
use anyhow::Context;
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, Cmd, Result,
install_format_hook, run, run_clippy, run_fuzzer, run_rustfmt, run_with_output, Cmd, Result,
};
// Latest stable, feel free to send a PR if this lags behind.
const REQUIRED_RUST_VERSION: (usize, usize) = (1, 39);
const REQUIRED_RUST_VERSION: u32 = 39;
struct InstallOpt {
client: Option<ClientOpt>,
@ -230,15 +229,20 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
}
fn install_server(opts: ServerOpt) -> Result<()> {
let target_dir = env::var_os("CARGO_TARGET_DIR").unwrap_or_else(|| "target".into());
let ac = autocfg::AutoCfg::with_dir(target_dir)?;
let old_rust = !ac.probe_rustc_version(REQUIRED_RUST_VERSION.0, REQUIRED_RUST_VERSION.1);
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;
}
}
}
if old_rust {
eprintln!(
"\nWARNING: at least rust {}.{}.0 is required to compile rust-analyzer\n",
REQUIRED_RUST_VERSION.0, REQUIRED_RUST_VERSION.1
"\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
REQUIRED_RUST_VERSION,
)
}
@ -250,10 +254,20 @@ fn install_server(opts: ServerOpt) -> Result<()> {
if res.is_err() && old_rust {
eprintln!(
"\nWARNING: at least rust {}.{}.0 is required to compile rust-analyzer\n",
REQUIRED_RUST_VERSION.0, REQUIRED_RUST_VERSION.1
"\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
REQUIRED_RUST_VERSION,
)
}
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,
}
}