diff options
| author | bors <bors@rust-lang.org> | 2021-12-23 08:59:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-23 08:59:55 +0000 |
| commit | c1d301bb29fd1b9f6f42de11d52015ae464cc8b2 (patch) | |
| tree | 0add89dabb63c6194550e7d4297fadbf29f178d5 /src | |
| parent | 390bb3406d6c15894139830f6a30e16a1e92053f (diff) | |
| parent | 155a4a87af9a3a7671e9df7394f5c1d4ab3d1927 (diff) | |
| download | rust-c1d301bb29fd1b9f6f42de11d52015ae464cc8b2.tar.gz rust-c1d301bb29fd1b9f6f42de11d52015ae464cc8b2.zip | |
Auto merge of #92167 - pierwill:chalk-update, r=jackh726
Update chalk to 0.75.0 - Compute flags in `intern_ty` - Remove `tracing-serde` from `PERMITTED_DEPENDENCIES` - Bump `tracing-tree` to 0.2.0 - Bump `tracing-subscriber` to 0.3.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/Cargo.toml | 4 | ||||
| -rw-r--r-- | src/tools/compiletest/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index 268905bcb53..3c9b6f5006d 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -19,11 +19,11 @@ itertools = "0.9" regex = "1" rustdoc-json-types = { path = "../rustdoc-json-types" } tracing = "0.1" -tracing-tree = "0.1.9" +tracing-tree = "0.2.0" tera = { version = "1.10.0", default-features = false } [dependencies.tracing-subscriber] -version = "0.2.13" +version = "0.3.3" default-features = false features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index e9426a2d9f5..23e49539969 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -9,7 +9,7 @@ diff = "0.1.10" unified-diff = "0.2.1" getopts = "0.2" tracing = "0.1" -tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] } +tracing-subscriber = { version = "0.3.3", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] } regex = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index d27afa497f6..edc6f52db3b 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -208,7 +208,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[ "tracing-attributes", "tracing-core", "tracing-log", - "tracing-serde", "tracing-subscriber", "tracing-tree", "typenum", |