diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-09-06 13:03:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-06 13:03:15 +0200 |
| commit | 020edbe4cf41aef407ac57eeb90c9a244c55d103 (patch) | |
| tree | 4306057ff5d16e46e7c4f8ee65bb22804409179b /compiler | |
| parent | 0d0f4eac8b98133e5da6d3604d86a8f3b5a67844 (diff) | |
| parent | 267d3c85088ebea128ef4b88435ceda937f306cd (diff) | |
| download | rust-020edbe4cf41aef407ac57eeb90c9a244c55d103.tar.gz rust-020edbe4cf41aef407ac57eeb90c9a244c55d103.zip | |
Rollup merge of #127316 - klensy:tracing-bump, r=Kobzol
move pinned version from tracing_core to tracing This PR removes pin from `tracing-core` and moves it to `tracing`, which regressed perf in > 0.1.37 versions.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_log/Cargo.toml | 4 | ||||
| -rw-r--r-- | compiler/rustc_log/src/lib.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_log/Cargo.toml b/compiler/rustc_log/Cargo.toml index c673d51a1d4..2332ff9b323 100644 --- a/compiler/rustc_log/Cargo.toml +++ b/compiler/rustc_log/Cargo.toml @@ -5,8 +5,8 @@ edition = "2024" [dependencies] # tidy-alphabetical-start -tracing = "0.1.28" -tracing-core = "=0.1.30" # FIXME(Nilstrieb) tracing has a deadlock: https://github.com/tokio-rs/tracing/issues/2635 +# tracing > 0.1.37 have huge binary size / instructions regression +tracing = "=0.1.37" tracing-subscriber = { version = "0.3.3", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] } tracing-tree = "0.3.1" # tidy-alphabetical-end diff --git a/compiler/rustc_log/src/lib.rs b/compiler/rustc_log/src/lib.rs index df648bbd489..26475eec1c1 100644 --- a/compiler/rustc_log/src/lib.rs +++ b/compiler/rustc_log/src/lib.rs @@ -38,7 +38,7 @@ use std::fmt::{self, Display}; use std::io::{self, IsTerminal}; use tracing::dispatcher::SetGlobalDefaultError; -use tracing_core::{Event, Subscriber}; +use tracing::{Event, Subscriber}; use tracing_subscriber::filter::{Directive, EnvFilter, LevelFilter}; use tracing_subscriber::fmt::FmtContext; use tracing_subscriber::fmt::format::{self, FormatEvent, FormatFields}; |