From e8eae536b15be1c8fc3bf2f66c2ed5b52edec41b Mon Sep 17 00:00:00 2001
From: Hayden Stainsby <hds@caffeineconcepts.com>
Date: Tue, 28 Mar 2023 12:17:53 +0200
Subject: [PATCH] chore(console): remove `tracing-subscriber` 0.2 from
 dependencies

The `color-eyre` crate was previously on version 0.5. This version
depends on `tracing-subscriber` 0.2, meaning that we had 2 different
veresions of `tracing-subscriber` in our dependency tree.

This change updates `color-eyre` to 0.6, which depends on
`tracing-subscriber` 0.3, the same as `console-subscriber`.
---
 Cargo.lock               | 35 ++++++++++++-----------------------
 tokio-console/Cargo.toml |  2 +-
 xtask/Cargo.toml         |  2 +-
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce3617900..be4f27905 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -240,9 +240,9 @@ dependencies = [
 
 [[package]]
 name = "color-eyre"
-version = "0.5.11"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f1885697ee8a177096d42f158922251a41973117f6d8a234cee94b9509157b7"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
 dependencies = [
  "backtrace",
  "color-spantrace",
@@ -256,9 +256,9 @@ dependencies = [
 
 [[package]]
 name = "color-spantrace"
-version = "0.1.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6eee477a4a8a72f4addd4de416eb56d54bc307b284d6601bafdee1f4ea462d1"
+checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
 dependencies = [
  "once_cell",
  "owo-colors",
@@ -298,7 +298,7 @@ dependencies = [
  "tonic",
  "tracing",
  "tracing-core",
- "tracing-subscriber 0.3.11",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -908,9 +908,9 @@ checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
 
 [[package]]
 name = "owo-colors"
-version = "1.3.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2386b4ebe91c2f7f51082d4cefa145d030e33a1842a96b12e4885cc3c01f7a55"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
 [[package]]
 name = "parking_lot"
@@ -1456,7 +1456,7 @@ dependencies = [
  "tonic",
  "tracing",
  "tracing-journald",
- "tracing-subscriber 0.3.11",
+ "tracing-subscriber",
  "tui",
 ]
 
@@ -1647,12 +1647,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-error"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4d7c0b83d4a500748fa5879461652b361edf5c9d51ede2a2ac03875ca185e24"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
 dependencies = [
  "tracing",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -1673,7 +1673,7 @@ checksum = "1ba49f4829f4e95702943ec6b2fad8936b369d20fa27036caf01329fb230e460"
 dependencies = [
  "libc",
  "tracing-core",
- "tracing-subscriber 0.3.11",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -1687,17 +1687,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-subscriber"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
-dependencies = [
- "sharded-slab",
- "thread_local",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.11"
diff --git a/tokio-console/Cargo.toml b/tokio-console/Cargo.toml
index 30496f672..6b0909312 100644
--- a/tokio-console/Cargo.toml
+++ b/tokio-console/Cargo.toml
@@ -39,7 +39,7 @@ tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
 tracing-journald = { version = "0.2", optional = true }
 prost-types = "0.11"
 crossterm = { version = "0.20", features = ["event-stream"] }
-color-eyre = { version = "0.5", features = ["issue-url"] }
+color-eyre = { version = "0.6", features = ["issue-url"] }
 hdrhistogram = { version = "7.3.0", default-features = false, features = ["serialization"] }
 h2 = "0.3"
 regex = "1.5"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 09f60941a..f113b8128 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -11,4 +11,4 @@ tonic-build = { version = "0.8", default-features = false, features = [
     "prost", "transport"
 ] }
 clap = { version = "3", features = ["derive"] }
-color-eyre = "0.5"
\ No newline at end of file
+color-eyre = "0.6"
\ No newline at end of file