From 155a4a87af9a3a7671e9df7394f5c1d4ab3d1927 Mon Sep 17 00:00:00 2001
From: pierwill <pierwill@users.noreply.github.com>
Date: Wed, 22 Dec 2021 10:14:06 -0600
Subject: [PATCH] Upgrade `tracing-subscriber`

---
 Cargo.lock                       | 40 ++++++--------------------------
 compiler/rustc_driver/Cargo.toml |  2 +-
 src/librustdoc/Cargo.toml        |  2 +-
 src/tools/compiletest/Cargo.toml |  2 +-
 4 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2b681b862b6..865393a7042 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -539,7 +539,7 @@ dependencies = [
  "petgraph",
  "rustc-hash",
  "tracing",
- "tracing-subscriber 0.3.3",
+ "tracing-subscriber",
  "tracing-tree",
 ]
 
@@ -704,7 +704,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tracing",
- "tracing-subscriber 0.2.16",
+ "tracing-subscriber",
  "unified-diff",
  "walkdir",
  "winapi",
@@ -2105,15 +2105,6 @@ dependencies = [
  "xml5ever",
 ]
 
-[[package]]
-name = "matchers"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
-dependencies = [
- "regex-automata",
-]
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -3854,7 +3845,7 @@ dependencies = [
  "rustc_target",
  "rustc_typeck",
  "tracing",
- "tracing-subscriber 0.2.16",
+ "tracing-subscriber",
  "tracing-tree",
  "winapi",
 ]
@@ -4633,7 +4624,7 @@ dependencies = [
  "tempfile",
  "tera",
  "tracing",
- "tracing-subscriber 0.2.16",
+ "tracing-subscriber",
  "tracing-tree",
 ]
 
@@ -5455,24 +5446,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-subscriber"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96"
-dependencies = [
- "ansi_term 0.12.1",
- "lazy_static",
- "matchers 0.0.1",
- "parking_lot",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.3"
@@ -5481,7 +5454,8 @@ checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3"
 dependencies = [
  "ansi_term 0.12.1",
  "lazy_static",
- "matchers 0.1.0",
+ "matchers",
+ "parking_lot",
  "regex",
  "sharded-slab",
  "smallvec",
@@ -5501,7 +5475,7 @@ dependencies = [
  "atty",
  "tracing-core",
  "tracing-log",
- "tracing-subscriber 0.3.3",
+ "tracing-subscriber",
 ]
 
 [[package]]
diff --git a/compiler/rustc_driver/Cargo.toml b/compiler/rustc_driver/Cargo.toml
index b6a38bc42c8..2383a000687 100644
--- a/compiler/rustc_driver/Cargo.toml
+++ b/compiler/rustc_driver/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["dylib"]
 libc = "0.2"
 atty = "0.2"
 tracing = { version = "0.1.28" }
-tracing-subscriber = { version = "0.2.16", 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"] }
 tracing-tree = "0.2.0"
 rustc_middle = { path = "../rustc_middle" }
 rustc_ast_pretty = { path = "../rustc_ast_pretty" }
diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml
index f9f1fc4bbb4..3c9b6f5006d 100644
--- a/src/librustdoc/Cargo.toml
+++ b/src/librustdoc/Cargo.toml
@@ -23,7 +23,7 @@ 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"