From 2dbdaa247b0aae3db0f987af9b1252529a8903f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Wed, 15 Nov 2023 13:04:39 +0200
Subject: [PATCH] Bump tracing-subscriber

---
 Cargo.lock                      | 23 +++++++++++++++++------
 Cargo.toml                      |  5 +++++
 crates/hir-ty/Cargo.toml        |  4 +---
 crates/rust-analyzer/Cargo.toml |  6 +-----
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c5ae82b57ee..df83c9948d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1601,7 +1601,7 @@ dependencies = [
  "tikv-jemallocator",
  "toolchain",
  "tracing",
- "tracing-log",
+ "tracing-log 0.1.3",
  "tracing-subscriber",
  "tracing-tree",
  "triomphe",
@@ -2036,15 +2036,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "tracing-subscriber"
-version = "0.3.17"
+name = "tracing-log"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "sharded-slab",
  "thread_local",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.2.0",
 ]
 
 [[package]]
@@ -2055,7 +2066,7 @@ checksum = "2ec6adcab41b1391b08a308cc6302b79f8095d1673f6947c2dc65ffb028b0b2d"
 dependencies = [
  "nu-ansi-term",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.1.3",
  "tracing-subscriber",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 973385667ab..3ebeb810269 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,6 +99,11 @@ smallvec = { version = "1.10.0", features = [
 ] }
 tracing = "0.1.40"
 tracing-tree = "0.2.5"
+tracing-subscriber = { version = "0.3.18", default-features = false, features = [
+    "registry",
+    "fmt",
+    "tracing-log",
+] }
 smol_str = "0.2.0"
 nohash-hasher = "0.2.0"
 text-size = "1.1.0"
diff --git a/crates/hir-ty/Cargo.toml b/crates/hir-ty/Cargo.toml
index de07e184e3d..2b65563add4 100644
--- a/crates/hir-ty/Cargo.toml
+++ b/crates/hir-ty/Cargo.toml
@@ -48,9 +48,7 @@ limit.workspace = true
 [dev-dependencies]
 expect-test = "1.4.0"
 tracing.workspace = true
-tracing-subscriber = { version = "0.3.16", default-features = false, features = [
-    "registry",
-] }
+tracing-subscriber.workspace = true
 tracing-tree.workspace = true
 project-model = { path = "../project-model" }
 
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index e9af760618f..6c4a2ea177c 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -36,11 +36,7 @@ num_cpus = "1.15.0"
 mimalloc = { version = "0.1.30", default-features = false, optional = true }
 lsp-server.workspace = true
 tracing.workspace = true
-tracing-subscriber = { version = "0.3.16", default-features = false, features = [
-    "registry",
-    "fmt",
-    "tracing-log",
-] }
+tracing-subscriber.workspace = true
 tracing-log = "0.1.3"
 tracing-tree.workspace = true
 triomphe.workspace = true