diff --git a/Cargo.lock b/Cargo.lock index 6144166ac7..bceadd1fb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2455,15 +2455,16 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +checksum = "186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb" dependencies = [ "cc", + "cfg-if 1.0.0", "libc", "log", "rustversion", - "windows 0.48.0", + "windows 0.54.0", ] [[package]] @@ -3602,9 +3603,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "loom" -version = "0.5.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" dependencies = [ "cfg-if 1.0.0", "generator", @@ -4815,9 +4816,9 @@ dependencies = [ [[package]] name = "profiling" -version = "1.0.8" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" dependencies = [ "profiling-procmacros", "tracy-client", @@ -6707,9 +6708,9 @@ dependencies = [ [[package]] name = "tracing-tracy" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e" +checksum = "6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614" dependencies = [ "tracing-core", "tracing-subscriber", @@ -6718,9 +6719,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.15.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608" +checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d" dependencies = [ "loom", "once_cell", @@ -8443,15 +8444,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.51.1" diff --git a/common/base/Cargo.toml b/common/base/Cargo.toml index fd939feb94..b8a322e01e 100644 --- a/common/base/Cargo.toml +++ b/common/base/Cargo.toml @@ -16,4 +16,4 @@ directories-next = "2.0" # NOTE: This must be kept in sync with the `tracy-client` version used by the # `tracing-tracy` version in `common/frontend`. # Using `=` here keeps `cargo update` from breaking this. -profiling = { version = "=1.0.8", default-features = false, optional = true } +profiling = { version = "=1.0.15", default-features = false, optional = true } diff --git a/common/frontend/Cargo.toml b/common/frontend/Cargo.toml index 10e836271a..3dd38224b5 100644 --- a/common/frontend/Cargo.toml +++ b/common/frontend/Cargo.toml @@ -20,4 +20,4 @@ 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`. # NOTE: `=` since the minor version of tracing-tracy bumped a major version of `tracy-client` -tracing-tracy = { version = "=0.10.2", optional = true } +tracing-tracy = { version = "=0.11.0", optional = true } diff --git a/common/frontend/src/lib.rs b/common/frontend/src/lib.rs index f2471fcb51..a297bc4ecb 100644 --- a/common/frontend/src/lib.rs +++ b/common/frontend/src/lib.rs @@ -109,7 +109,9 @@ where // Create the terminal writer layer. #[cfg(feature = "tracy")] - let registry = registry.with(tracing_tracy::TracyLayer::new().with_stackdepth(0)); + let registry = registry.with(tracing_tracy::TracyLayer::new( + tracing_tracy::DefaultConfig::default(), + )); #[cfg(not(feature = "tracy"))] let registry = { let (non_blocking, stdio_guard) = tracing_appender::non_blocking(terminal.make_writer());