Rollup merge of #107048 - DebugSteven:newer-x-check-cargo, r=albertlarsan68
check for x version updates This PR adds a check to tidy to assert that the installed version of `x` is equal to the version in `src/tools/x/Cargo.toml`. It checks the installed version of `x` by parsing the output of `cargo install --list` (as an option proposed in this [issue](https://github.com/rust-lang/rust/issues/106469)). It does not warn if `x` has not yet been installed, on the assumption that the user isn't interested in using it.
This commit is contained in:
commit
d26c88c752
@ -5608,6 +5608,7 @@ dependencies = [
|
||||
"lazy_static",
|
||||
"miropt-test-tools",
|
||||
"regex",
|
||||
"semver",
|
||||
"termcolor",
|
||||
"walkdir",
|
||||
]
|
||||
|
@ -12,6 +12,7 @@ miropt-test-tools = { path = "../miropt-test-tools" }
|
||||
lazy_static = "1"
|
||||
walkdir = "2"
|
||||
ignore = "0.4.18"
|
||||
semver = "1.0"
|
||||
termcolor = "1.1.3"
|
||||
|
||||
[[bin]]
|
||||
|
@ -70,3 +70,4 @@ fn tidy_error(bad: &mut bool, args: impl Display) -> std::io::Result<()> {
|
||||
pub mod unit_tests;
|
||||
pub mod unstable_book;
|
||||
pub mod walk;
|
||||
pub mod x_version;
|
||||
|
@ -114,6 +114,8 @@ macro_rules! check {
|
||||
check!(alphabetical, &compiler_path);
|
||||
check!(alphabetical, &library_path);
|
||||
|
||||
check!(x_version, &root_path, &cargo);
|
||||
|
||||
let collected = {
|
||||
drain_handles(&mut handles);
|
||||
|
||||
|
68
src/tools/tidy/src/x_version.rs
Normal file
68
src/tools/tidy/src/x_version.rs
Normal file
@ -0,0 +1,68 @@
|
||||
use semver::Version;
|
||||
use std::path::Path;
|
||||
use std::process::{Command, Stdio};
|
||||
|
||||
pub fn check(root: &Path, cargo: &Path, bad: &mut bool) {
|
||||
let cargo_list = Command::new(cargo).args(["install", "--list"]).stdout(Stdio::piped()).spawn();
|
||||
|
||||
let child = match cargo_list {
|
||||
Ok(child) => child,
|
||||
Err(e) => return tidy_error!(bad, "failed to run `cargo`: {}", e),
|
||||
};
|
||||
|
||||
let cargo_list = child.wait_with_output().unwrap();
|
||||
|
||||
if cargo_list.status.success() {
|
||||
let exe_list = String::from_utf8_lossy(&cargo_list.stdout);
|
||||
let exe_list = exe_list.lines();
|
||||
|
||||
let mut installed: Option<Version> = None;
|
||||
|
||||
for line in exe_list {
|
||||
let mut iter = line.split_whitespace();
|
||||
if iter.next() == Some("x") {
|
||||
if let Some(version) = iter.next() {
|
||||
// Check this is the rust-lang/rust x tool installation since it should be
|
||||
// installed at a path containing `src/tools/x`.
|
||||
if let Some(path) = iter.next() {
|
||||
if path.contains(&"src/tools/x") {
|
||||
let version = version.strip_prefix("v").unwrap();
|
||||
installed = Some(Version::parse(version).unwrap());
|
||||
break;
|
||||
}
|
||||
};
|
||||
}
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
// Unwrap the some if x is installed, otherwise return because it's fine if x isn't installed.
|
||||
let installed = if let Some(i) = installed { i } else { return };
|
||||
|
||||
if let Some(expected) = get_x_wrapper_version(root, cargo) {
|
||||
if installed < expected {
|
||||
return println!(
|
||||
"Current version of x is {installed}, but the latest version is {expected}\nConsider updating to the newer version of x by running `cargo install --path src/tools/x`"
|
||||
);
|
||||
}
|
||||
} else {
|
||||
return tidy_error!(
|
||||
bad,
|
||||
"Unable to parse the latest version of `x` at `src/tools/x/Cargo.toml`"
|
||||
);
|
||||
}
|
||||
} else {
|
||||
return tidy_error!(bad, "failed to check version of `x`: {}", cargo_list.status);
|
||||
}
|
||||
}
|
||||
|
||||
// Parse latest version out of `x` Cargo.toml
|
||||
fn get_x_wrapper_version(root: &Path, cargo: &Path) -> Option<Version> {
|
||||
let mut cmd = cargo_metadata::MetadataCommand::new();
|
||||
cmd.cargo_path(cargo)
|
||||
.manifest_path(root.join("src/tools/x/Cargo.toml"))
|
||||
.no_deps()
|
||||
.features(cargo_metadata::CargoOpt::AllFeatures);
|
||||
let mut metadata = t!(cmd.exec());
|
||||
metadata.packages.pop().map(|x| x.version)
|
||||
}
|
Loading…
Reference in New Issue
Block a user