diff --git a/tracing-subscriber/Cargo.toml b/tracing-subscriber/Cargo.toml index 92efbff84..914bbd995 100644 --- a/tracing-subscriber/Cargo.toml +++ b/tracing-subscriber/Cargo.toml @@ -42,8 +42,8 @@ tracing-core = { path = "../tracing-core", version = "0.2", default-features = f # only required by the `env-filter` feature tracing = { optional = true, path = "../tracing", version = "0.2", default-features = false } -matchers = { optional = true, version = "0.1.0" } -regex = { optional = true, version = "1.6.0", default-features = false, features = ["std", "unicode-case", "unicode-perl"] } +matchers = { optional = true, version = "0.2.0" } +regex = { optional = true, version = "1.9.0", default-features = false, features = ["std", "unicode-case", "unicode-perl"] } smallvec = { optional = true, version = "1.9.0" } once_cell = { optional = true, version = "1.13.0" } diff --git a/tracing-subscriber/src/filter/env/field.rs b/tracing-subscriber/src/filter/env/field.rs index d6d97afe3..1e014c3b5 100644 --- a/tracing-subscriber/src/filter/env/field.rs +++ b/tracing-subscriber/src/filter/env/field.rs @@ -234,7 +234,7 @@ impl ValueMatch { /// This returns an error if the string didn't contain a valid `bool`, /// `u64`, `i64`, or `f64` literal, and couldn't be parsed as a regular /// expression. - fn parse_regex(s: &str) -> Result { + fn parse_regex(s: &str) -> Result { s.parse::() .map(ValueMatch::Bool) .or_else(|_| s.parse::().map(ValueMatch::U64)) @@ -279,7 +279,7 @@ impl fmt::Display for ValueMatch { // === impl MatchPattern === impl FromStr for MatchPattern { - type Err = matchers::Error; + type Err = matchers::BuildError; fn from_str(s: &str) -> Result { let matcher = Pattern::new_anchored(s)?; Ok(Self {