From afe97f4d670b02fbb13354a0697e178442086944 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Thu, 14 Sep 2023 22:15:08 -0400
Subject: [PATCH] Make sure we use one version of tracy-client!!!!!

---
 Cargo.lock                 | 19 ++++---------------
 common/frontend/Cargo.toml |  3 ++-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index de850eb772..6cf2b9790c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4588,7 +4588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
 dependencies = [
  "profiling-procmacros",
- "tracy-client 0.15.2",
+ "tracy-client",
 ]
 
 [[package]]
@@ -6532,13 +6532,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-tracy"
-version = "0.10.3"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3edd27f53bc0e55aefa9223f68eb44354060103d3e34635f6e27627fe0227f"
+checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e"
 dependencies = [
  "tracing-core",
  "tracing-subscriber",
- "tracy-client 0.16.1",
+ "tracy-client",
 ]
 
 [[package]]
@@ -6552,17 +6552,6 @@ dependencies = [
  "tracy-client-sys",
 ]
 
-[[package]]
-name = "tracy-client"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c78458aa3759647e0399e959a06f9f6dc61450a1caaa4f1632a3df8e8c55af7"
-dependencies = [
- "loom",
- "once_cell",
- "tracy-client-sys",
-]
-
 [[package]]
 name = "tracy-client-sys"
 version = "0.21.1"
diff --git a/common/frontend/Cargo.toml b/common/frontend/Cargo.toml
index 244cf9b4db..4f1fe6b3a5 100644
--- a/common/frontend/Cargo.toml
+++ b/common/frontend/Cargo.toml
@@ -20,4 +20,5 @@ tracing-subscriber = { version = "0.3.7", default-features = false, features = [
 
 # Tracy
 # NOTE: This must be kept in sync with the `profiling` version in `common/base`.
-tracing-tracy = { version = "0.10.2", optional = true }
+# NOTE: `=` since the minor version of tracing-tracy bumped a major version of `tracy-client`
+tracing-tracy = { version = "=0.10.2", optional = true }