diff --git a/Cargo.lock b/Cargo.lock index 90b5067d22..e2fde3fd20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -237,7 +237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", - "regex-automata 0.4.14", + "regex-automata", "serde", ] @@ -1364,11 +1364,11 @@ dependencies = [ [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -1444,12 +1444,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "overload", - "winapi", + "windows-sys 0.61.2", ] [[package]] @@ -1636,12 +1635,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "percent-encoding" version = "2.3.2" @@ -1694,9 +1687,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "platforms" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a546fc83c436ffbef8e7e639df8498bbc5122e0bd19cf8db208720c2cc85290e" +checksum = "a22ff26099e927412d085a6c2dc539ad50ba69eab451b19846fef40373a3f645" [[package]] name = "portable-atomic" @@ -1760,7 +1753,7 @@ dependencies = [ "rand 0.9.2", "rand_chacha 0.9.0", "rand_xorshift", - "regex-syntax 0.8.10", + "regex-syntax", "rusty-fork", "tempfile", "unarray", @@ -1949,17 +1942,8 @@ checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.14", - "regex-syntax 0.8.10", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -1970,15 +1954,9 @@ checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.10", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.10" @@ -2969,14 +2947,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", diff --git a/Cargo.toml b/Cargo.toml index 6994070866..13f1f8e3c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,9 +100,7 @@ toml = "1.0" tracing = "0.1" tracing-log = "0.2" tracing-opentelemetry = { version = "0.32", optional = true } -# Newer versions render ANSI escape codes, causing CLI errors to be ugly -# See also https://github.com/tokio-rs/tracing/issues/3369 -tracing-subscriber = { version = "=0.3.19", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.23", features = ["env-filter"] } url = "2.4" wait-timeout = "0.2" xz2 = "0.1.3" diff --git a/src/cli/log.rs b/src/cli/log.rs index 17f1e87426..ab20922aa6 100644 --- a/src/cli/log.rs +++ b/src/cli/log.rs @@ -50,7 +50,8 @@ where let process = process.clone(); let logger = tracing_subscriber::fmt::layer() .with_writer(process.stderr()) - .with_ansi(true); // `process.stderr()` will translate ANSI escape codes + .with_ansi(true) + .with_ansi_sanitization(false); // `process.stderr()` will translate ANSI escape codes if let Ok(directives) = maybe_rustup_log_directives { let (env_filter, handle) = reload::Layer::new( EnvFilter::builder()