bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #139520 - jieyouxu:compiletest-maintenance-1, r=lqd

Browse source 
compiletest maintenance: sort deps and drop dep on `anyhow`

Two changes:

1. Sort compiletest deps alphabetically because it was annoying me (harder to quickly glance what deps compiletest is using).
2. Drop dependency on `anyhow`. There's only one usage of `anyhow`, which is for `with_context` on sth that would immediately panic anyway.
This commit is contained in:
Matthias Krüger 2025-04-08 21:26:00 +02:00 • committed by GitHub
commit 40be0470b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock
View file

@ -718,7 +718,6 @@ name = "compiletest"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"anstyle-svg", "anstyle-svg",
"anyhow",
"build_helper", "build_helper",
"colored", "colored",
"diff", "diff",

17
src/tools/compiletest/Cargo.toml
View file

@ -7,25 +7,26 @@ edition = "2021"
doctest = false doctest = false
[dependencies] [dependencies]
# tidy-alphabetical-start
anstyle-svg = "0.1.3" anstyle-svg = "0.1.3"
build_helper = { path = "../../build_helper" }
colored = "2" colored = "2"
diff = "0.1.10" diff = "0.1.10"
unified-diff = "0.2.1"
getopts = "0.2" getopts = "0.2"
glob = "0.3.0"
home = "0.5.5"
indexmap = "2.0.0" indexmap = "2.0.0"
miropt-test-tools = { path = "../miropt-test-tools" } miropt-test-tools = { path = "../miropt-test-tools" }
build_helper = { path = "../../build_helper" }
tracing = "0.1"
tracing-subscriber = { version = "0.3.3", default-features = false, features = ["ansi", "env-filter", "fmt", "parking_lot", "smallvec"] }
regex = "1.0" regex = "1.0"
rustfix = "0.8.1"
semver = { version = "1.0.23", features = ["serde"] } semver = { version = "1.0.23", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
rustfix = "0.8.1" tracing = "0.1"
tracing-subscriber = { version = "0.3.3", default-features = false, features = ["ansi", "env-filter", "fmt", "parking_lot", "smallvec"] }
unified-diff = "0.2.1"
walkdir = "2" walkdir = "2"
glob = "0.3.0" # tidy-alphabetical-end
anyhow = "1"
home = "0.5.5"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
libc = "0.2" libc = "0.2"

11
src/tools/compiletest/src/runtest.rs
View file

@ -10,7 +10,6 @@ use std::process::{Child, Command, ExitStatus, Output, Stdio};
use std::sync::Arc; use std::sync::Arc;
use std::{env, iter, str}; use std::{env, iter, str};
use anyhow::Context;
use colored::Colorize; use colored::Colorize;
use regex::{Captures, Regex}; use regex::{Captures, Regex};
use tracing::*; use tracing::*;
@ -143,11 +142,11 @@ pub fn run(config: Arc<Config>, testpaths: &TestPaths, revision: Option<&str>) {
} }
let cx = TestCx { config: &config, props: &props, testpaths, revision }; let cx = TestCx { config: &config, props: &props, testpaths, revision };
create_dir_all(&cx.output_base_dir())
.with_context(|| { if let Err(e) = create_dir_all(&cx.output_base_dir()) {
format!("failed to create output base directory {}", cx.output_base_dir().display()) panic!("failed to create output base directory {}: {e}", cx.output_base_dir().display());
}) }
.unwrap();
if props.incremental { if props.incremental {
cx.init_incremental_test(); cx.init_incremental_test();
} }