diff --git a/Cargo.lock b/Cargo.lock index f9c2f7114..233b85fab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -694,8 +694,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata", + "regex-syntax", ] [[package]] @@ -807,7 +807,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata", "same-file", "walkdir", "winapi-util", @@ -989,15 +989,6 @@ dependencies = [ "url", ] -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "memchr" version = "2.7.2" @@ -2013,17 +2004,8 @@ checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[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]] @@ -2034,15 +2016,9 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "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.3" @@ -2708,14 +2684,10 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers", "nu-ansi-term", - "once_cell", - "regex", "sharded-slab", "smallvec", "thread_local", - "tracing", "tracing-core", "tracing-log", ] diff --git a/crates/oxc_cli/Cargo.toml b/crates/oxc_cli/Cargo.toml index 65cbe4982..7cbd17b92 100644 --- a/crates/oxc_cli/Cargo.toml +++ b/crates/oxc_cli/Cargo.toml @@ -53,7 +53,7 @@ miette = { workspace = true } tempfile = { workspace = true } rayon = { workspace = true } bpaf = { workspace = true, features = ["autocomplete", "bright-color", "derive"] } -tracing-subscriber = { workspace = true, features = ["env-filter"] } +tracing-subscriber = { workspace = true, features = [] } # Omit the `regex` feature [features] default = [] diff --git a/crates/oxc_cli/src/lint/main.rs b/crates/oxc_cli/src/lint/main.rs index 725ba624c..8e956eca7 100644 --- a/crates/oxc_cli/src/lint/main.rs +++ b/crates/oxc_cli/src/lint/main.rs @@ -26,7 +26,21 @@ fn init_miette() { miette::set_hook(Box::new(|_| Box::new(miette::MietteHandlerOpts::new().build()))).unwrap(); } +/// To debug `oxc_resolver`: +/// `OXC_LOG=oxc_resolver oxlint --import-plugin` fn init_tracing() { - use tracing_subscriber::{fmt, prelude::*, registry, EnvFilter}; - registry().with(fmt::layer()).with(EnvFilter::from_env("OXC_LOG")).init(); + use tracing_subscriber::{filter::Targets, prelude::*}; + + // Usage without the `regex` feature. + // + tracing_subscriber::registry() + .with(std::env::var("OXC_LOG").map_or_else( + |_| Targets::new(), + |env_var| { + use std::str::FromStr; + Targets::from_str(&env_var).unwrap() + }, + )) + .with(tracing_subscriber::fmt::layer()) + .init(); }