subscriber: update matchers to 0.2 (#3033)

Update the version of the `matchers` crate to 0.2. This requires also
adding a direct dependency on `regex-automata` to enable the `std`
feature.
This commit is contained in:
Oscar Gustafsson
2025-05-27 10:28:28 +02:00
committed by GitHub
parent 906f00ce4c
commit c3f5745b73
38 changed files with 70 additions and 67 deletions

View File

@@ -121,7 +121,7 @@ jobs:
shell: bash
check-msrv:
# Run `cargo check` on our minimum supported Rust version (1.63.0). This
# Run `cargo check` on our minimum supported Rust version (1.65.0). This
# checks with minimal versions; maximal versions are checked above.
name: "cargo check (+MSRV -Zminimal-versions)"
needs: check
@@ -143,7 +143,7 @@ jobs:
- tracing-tower
- tracing
toolchain:
- 1.63.0
- 1.65.0
- stable
steps:
- uses: actions/checkout@v4

View File

@@ -254,7 +254,7 @@ attachment that `Future::instrument` does.
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio
@@ -398,7 +398,7 @@ are not maintained by the `tokio` project. These include:
- [`tracing-elastic-apm`] provides a layer for reporting traces to [Elastic APM].
- [`tracing-etw`] provides a layer for emitting Windows [ETW] events.
- [`sentry-tracing`] provides a layer for reporting events and traces to [Sentry].
- [`tracing-forest`] provides a subscriber that preserves contextual coherence by
- [`tracing-forest`] provides a subscriber that preserves contextual coherence by
grouping together logs from the same spans during writing.
- [`tracing-loki`] provides a layer for shipping logs to [Grafana Loki].
- [`tracing-logfmt`] provides a layer that formats events and spans into the logfmt format.

View File

@@ -25,7 +25,7 @@ keywords = ["logging", "tracing", "macro", "instrument", "log"]
license = "MIT"
readme = "README.md"
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.65.0"
[lib]
proc-macro = true

View File

@@ -37,7 +37,7 @@ structured, event-based diagnostic information. This crate provides the
Note that this macro is also re-exported by the main `tracing` crate.
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
@@ -69,7 +69,7 @@ pub fn my_function(my_arg: usize) {
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -6,7 +6,7 @@
//!
//! Note that this macro is also re-exported by the main `tracing` crate.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//!
@@ -41,7 +41,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -22,7 +22,7 @@ categories = [
]
keywords = ["logging", "tracing", "profiling"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.65.0"
[features]
default = ["std"]

View File

@@ -53,12 +53,12 @@ The crate provides:
In addition, it defines the global callsite registry and per-thread current
dispatcher which other components of the tracing system rely on.
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
## Usage
Application authors will typically not use this crate directly. Instead, they
will use the [`tracing`] crate, which provides a much more fully-featured
API. However, this crate's API will change very infrequently, so it may be used
@@ -99,7 +99,7 @@ The following crate feature flags are available:
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -23,7 +23,7 @@
//! In addition, it defines the global callsite registry and per-thread current
//! dispatcher which other components of the tracing system rely on.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//!
@@ -109,7 +109,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -29,7 +29,7 @@ keywords = [
"backtrace"
]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.65.0"
[features]
default = ["traced-error"]

View File

@@ -48,7 +48,7 @@ The crate provides the following:
**Note**: This crate is currently experimental.
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
@@ -186,7 +186,7 @@ fn main() {
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -18,7 +18,7 @@
//!
//! **Note**: This crate is currently experimental.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//!
@@ -166,7 +166,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -19,7 +19,7 @@ categories = [
"asynchronous",
]
keywords = ["tracing", "subscriber", "flamegraph", "profiling"]
rust-version = "1.63.0"
rust-version = "1.65.0"
[features]
default = ["smallvec"]

View File

@@ -26,7 +26,7 @@ flamegraph/flamechart. Flamegraphs/flamecharts are useful for identifying perfor
bottlenecks in an application. For more details, see Brendan Gregg's [post]
on flamegraphs.
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
[post]: http://www.brendangregg.com/flamegraphs.html
@@ -106,7 +106,7 @@ _flamechart_, which _does not_ sort or collapse identical stack frames.
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -10,7 +10,7 @@
//! issues bottlenecks in an application. For more details, see Brendan Gregg's [post]
//! on flamegraphs.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//! [post]: http://www.brendangregg.com/flamegraphs.html
@@ -95,7 +95,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -16,7 +16,7 @@ categories = [
]
keywords = ["logging", "profiling", "tracing", "futures", "async"]
license = "MIT"
rust-version = "1.63.0"
rust-version = "1.65.0"
[features]
default = ["std-future", "std"]

View File

@@ -51,14 +51,14 @@ The crate provides the following traits:
[`Subscriber`]: https://docs.rs/tracing/latest/tracing/subscriber/index.html
[`tracing`]: https://crates.io/crates/tracing
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -15,7 +15,7 @@
//! * [`WithCollector`] allows a `tracing` [collector] to be attached to a
//! future, sink, stream, or executor.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//!
@@ -59,7 +59,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -13,7 +13,7 @@ categories = [
"development-tools::profiling",
]
keywords = ["tracing", "journald"]
rust-version = "1.63.0"
rust-version = "1.65.0"
[dependencies]
libc = "0.2.126"

View File

@@ -27,8 +27,8 @@ scoped, structured, and async-aware diagnostics. `tracing-journald` provides a
[`tracing-subscriber::Layer`][layer] implementation for logging `tracing` spans
and events to [`systemd-journald`][journald], on Linux distributions that use
`systemd`.
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
[`tracing`]: https://crates.io/crates/tracing
@@ -38,7 +38,7 @@ and events to [`systemd-journald`][journald], on Linux distributions that use
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -11,7 +11,7 @@
//! and events to [`systemd-journald`][journald], on Linux distributions that
//! use `systemd`.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//! [`tracing`]: https://crates.io/crates/tracing
@@ -21,7 +21,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -15,7 +15,7 @@ categories = [
keywords = ["logging", "tracing", "log"]
license = "MIT"
readme = "README.md"
rust-version = "1.63.0"
rust-version = "1.65.0"
[features]
default = ["log-tracer", "std"]

View File

@@ -56,14 +56,14 @@ This crate provides:
[`tracing::Subscriber`]: https://docs.rs/tracing/latest/tracing/trait.Subscriber.html
[`tracing::Event`]: https://docs.rs/tracing/latest/tracing/struct.Event.html
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -16,7 +16,7 @@
//! - An [`env_logger`] module, with helpers for using the [`env_logger` crate]
//! with `tracing` (optional, enabled by the `env-logger` feature).
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//!
@@ -76,7 +76,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -15,7 +15,7 @@ categories = [
]
keywords = ["logging", "tracing"]
license = "MIT"
rust-version = "1.63.0"
rust-version = "1.65.0"
[dependencies]
tracing = { path = "../tracing", version = "0.2", default-features = false }

View File

@@ -14,7 +14,7 @@ readme = "README.md"
repository = "https://github.com/tokio-rs/tracing"
homepage = "https://tokio.rs"
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.65.0"
publish = false
[dependencies]

View File

@@ -29,7 +29,7 @@ structured, event-based diagnostic information. `tracing-mock` provides
tools for making assertions about what `tracing` diagnostics are emitted
by code under test.
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
@@ -154,7 +154,7 @@ handle.assert_finished();
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -16,7 +16,7 @@ categories = [
"encoding",
]
keywords = ["logging", "tracing", "serialization"]
rust-version = "1.63.0"
rust-version = "1.65.0"
[features]
default = ["std"]

View File

@@ -18,7 +18,7 @@ An adapter for serializing [`tracing`] types using [`serde`].
[`tracing`] is a framework for instrumenting Rust programs to collect
scoped, structured, and async-aware diagnostics.`tracing-serde` enables
serializing `tracing` types using [`serde`].
serializing `tracing` types using [`serde`].
Traditional logging is based on human-readable text messages.
`tracing` gives us machine-readable structured diagnostic
@@ -36,7 +36,7 @@ and tracing data to monitor your services in production.
The `tracing` crate provides the APIs necessary for instrumenting
libraries and applications to emit trace data.
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
@@ -113,7 +113,7 @@ The following crate feature flags are available:
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -32,7 +32,7 @@
//! The `tracing` crate provides the APIs necessary for instrumenting
//! libraries and applications to emit trace data.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//!
@@ -134,7 +134,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -20,14 +20,14 @@ categories = [
"asynchronous",
]
keywords = ["logging", "tracing", "metrics", "subscriber"]
rust-version = "1.63.0"
rust-version = "1.65.0"
[features]
default = ["smallvec", "fmt", "ansi", "tracing-log", "std"]
alloc = ["tracing-core/alloc", "portable-atomic-util?/alloc"]
std = ["alloc", "tracing-core/std"]
env-filter = ["matchers", "once_cell", "tracing", "std", "thread_local"]
env-filter = ["matchers", "once_cell", "tracing", "std", "thread_local", "dep:regex-automata"]
fmt = ["registry", "std"]
ansi = ["fmt", "nu-ansi-term"]
registry = ["sharded-slab", "thread_local", "std"]
@@ -47,7 +47,9 @@ 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" }
matchers = { optional = true, version = "0.2.0" }
# required to have matchers::BuildError implement std::error::Error
regex-automata = { optional = true, version = "0.4", default-features = false, features = ["std"] }
smallvec = { optional = true, version = "1.9.0" }
once_cell = { optional = true, version = "1.13.0" }

View File

@@ -32,14 +32,14 @@ Utilities for implementing and composing [`tracing`][tracing] subscribers.
[discord-url]: https://discord.gg/EeF3cQw
[maint-badge]: https://img.shields.io/badge/maintenance-experimental-blue.svg
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -234,7 +234,8 @@ 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<Self, matchers::Error> {
#[allow(clippy::result_large_err)]
fn parse_regex(s: &str) -> Result<Self, matchers::BuildError> {
s.parse::<bool>()
.map(ValueMatch::Bool)
.or_else(|_| s.parse::<u64>().map(ValueMatch::U64))
@@ -279,7 +280,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<Self, Self::Err> {
let matcher = Pattern::new_anchored(s)?;
Ok(Self {

View File

@@ -16,7 +16,7 @@
//! tracing-subscriber = "0.3"
//! ```
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: ../index.html#supported-rust-versions
//!

View File

@@ -10,7 +10,7 @@
//! `tracing-subscriber` is intended for use by both `Collector` authors and
//! application authors using `tracing` to instrument their applications.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//!
@@ -106,7 +106,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -15,7 +15,7 @@ categories = [
]
keywords = ["logging", "tracing"]
license = "MIT"
rust-version = "1.63.0"
rust-version = "1.65.0"
[features]
default = ["tower-layer", "tower-make"]

View File

@@ -25,7 +25,7 @@ categories = [
]
keywords = ["logging", "tracing", "metrics", "async"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.65.0"
[dependencies]
tracing-core = { path = "../tracing-core", version = "0.2", default-features = false }

View File

@@ -47,7 +47,7 @@ data as well as textual messages.
The `tracing` crate provides the APIs necessary for instrumenting libraries
and applications to emit trace data.
*Compiler support: [requires `rustc` 1.63+][msrv]*
*Compiler support: [requires `rustc` 1.65+][msrv]*
[msrv]: #supported-rust-versions
@@ -429,7 +429,7 @@ undergoing active development. They may be less stable than `tracing` and
## Supported Rust Versions
Tracing is built against the latest stable release. The minimum supported
version is 1.63. The current Tracing version is not guaranteed to build on Rust
version is 1.65. The current Tracing version is not guaranteed to build on Rust
versions earlier than the minimum supported version.
Tracing follows the same compiler support policies as the rest of the Tokio

View File

@@ -19,7 +19,7 @@
//! The `tracing` crate provides the APIs necessary for instrumenting libraries
//! and applications to emit trace data.
//!
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
//! *Compiler support: [requires `rustc` 1.65+][msrv]*
//!
//! [msrv]: #supported-rust-versions
//! # Core Concepts
@@ -894,7 +894,7 @@
//! ## Supported Rust Versions
//!
//! Tracing is built against the latest stable release. The minimum supported
//! version is 1.63. The current Tracing version is not guaranteed to build on
//! version is 1.65. The current Tracing version is not guaranteed to build on
//! Rust versions earlier than the minimum supported version.
//!
//! Tracing follows the same compiler support policies as the rest of the Tokio