Skip to content

Commit 2d189aa

Browse files
authored
Rollup merge of rust-lang#78137 - tmiasko:compiletest-tracing, r=Mark-Simulacrum
Initialize tracing subscriber in compiletest tool The logging in compiletest was migrated from log crate to a tracing, but the initialization code was never changed, so logging is non-functional. Initialize tracing subscriber using default settings.
2 parents 46f9f01 + 08d5e96 commit 2d189aa

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Cargo.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,6 @@ name = "compiletest"
649649
version = "0.0.0"
650650
dependencies = [
651651
"diff",
652-
"env_logger 0.7.1",
653652
"getopts",
654653
"glob",
655654
"lazy_static",
@@ -660,6 +659,7 @@ dependencies = [
660659
"serde",
661660
"serde_json",
662661
"tracing",
662+
"tracing-subscriber",
663663
"walkdir",
664664
"winapi 0.3.9",
665665
]

src/tools/compiletest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ edition = "2018"
66

77
[dependencies]
88
diff = "0.1.10"
9-
env_logger = { version = "0.7", default-features = false }
109
getopts = "0.2"
1110
tracing = "0.1"
11+
tracing-subscriber = { version = "0.2.13", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
1212
regex = "1.0"
1313
serde = { version = "1.0", features = ["derive"] }
1414
serde_json = "1.0"

src/tools/compiletest/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub mod runtest;
3535
pub mod util;
3636

3737
fn main() {
38-
env_logger::init();
38+
tracing_subscriber::fmt::init();
3939

4040
let config = parse_config(env::args().collect());
4141

0 commit comments

Comments
 (0)