Skip to content

Commit 8836382

Browse files
committed
Auto merge of rust-lang#127316 - klensy:tracing-bump, r=<try>
bump tracing Unpins `tracing`: linked issue looks fixed, tokio-rs/tracing#2635 referencing davidbarsky/tracing-tree#82 Perf run please, as changelog says about improvements https://github.com/tokio-rs/tracing/blob/tracing-0.1.40/tracing/CHANGELOG.md https://github.com/tokio-rs/tracing/blob/tracing-core-0.1.32/tracing-core/CHANGELOG.md
2 parents 9ffe52e + d58137b commit 8836382

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Cargo.lock

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4289,7 +4289,6 @@ version = "0.0.0"
42894289
dependencies = [
42904290
"rustc_span",
42914291
"tracing",
4292-
"tracing-core",
42934292
"tracing-subscriber",
42944293
"tracing-tree",
42954294
]
@@ -5811,11 +5810,10 @@ checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
58115810

58125811
[[package]]
58135812
name = "tracing"
5814-
version = "0.1.37"
5813+
version = "0.1.40"
58155814
source = "registry+https://github.com/rust-lang/crates.io-index"
5816-
checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
5815+
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
58175816
dependencies = [
5818-
"cfg-if",
58195817
"pin-project-lite",
58205818
"tracing-attributes",
58215819
"tracing-core",
@@ -5834,9 +5832,9 @@ dependencies = [
58345832

58355833
[[package]]
58365834
name = "tracing-core"
5837-
version = "0.1.30"
5835+
version = "0.1.32"
58385836
source = "registry+https://github.com/rust-lang/crates.io-index"
5839-
checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
5837+
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
58405838
dependencies = [
58415839
"once_cell",
58425840
"valuable",

compiler/rustc_log/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ edition = "2021"
66
[dependencies]
77
# tidy-alphabetical-start
88
tracing = "0.1.28"
9-
tracing-core = "=0.1.30" # FIXME(Nilstrieb) tracing has a deadlock: https://github.com/tokio-rs/tracing/issues/2635
109
tracing-subscriber = { version = "0.3.3", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
1110
tracing-tree = "0.3.1"
1211
# tidy-alphabetical-end

compiler/rustc_log/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
use std::env::{self, VarError};
4242
use std::fmt::{self, Display};
4343
use std::io::{self, IsTerminal};
44-
use tracing_core::{Event, Subscriber};
44+
use tracing::{Event, Subscriber};
4545
use tracing_subscriber::filter::{Directive, EnvFilter, LevelFilter};
4646
use tracing_subscriber::fmt::{
4747
format::{self, FormatEvent, FormatFields},

0 commit comments

Comments
 (0)