Make sure we use one version of tracy-client!!!!!

This commit is contained in:
Imbris 2023-09-14 22:15:08 -04:00
parent aabf67a72a
commit afe97f4d67
2 changed files with 6 additions and 16 deletions

19
Cargo.lock generated
View File

@ -4588,7 +4588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
dependencies = [ dependencies = [
"profiling-procmacros", "profiling-procmacros",
"tracy-client 0.15.2", "tracy-client",
] ]
[[package]] [[package]]
@ -6532,13 +6532,13 @@ dependencies = [
[[package]] [[package]]
name = "tracing-tracy" name = "tracing-tracy"
version = "0.10.3" version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3edd27f53bc0e55aefa9223f68eb44354060103d3e34635f6e27627fe0227f" checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e"
dependencies = [ dependencies = [
"tracing-core", "tracing-core",
"tracing-subscriber", "tracing-subscriber",
"tracy-client 0.16.1", "tracy-client",
] ]
[[package]] [[package]]
@ -6552,17 +6552,6 @@ dependencies = [
"tracy-client-sys", "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]] [[package]]
name = "tracy-client-sys" name = "tracy-client-sys"
version = "0.21.1" version = "0.21.1"

View File

@ -20,4 +20,5 @@ tracing-subscriber = { version = "0.3.7", default-features = false, features = [
# Tracy # Tracy
# NOTE: This must be kept in sync with the `profiling` version in `common/base`. # 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 }