From 78d8a6710e9b080dece979b53b0fee2a78e573af Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Sat, 27 Jan 2024 17:24:51 -0800 Subject: [PATCH] Upgrade deps Signed-off-by: Alex Saveau --- Cargo.lock | 115 +++++++++++++++++++++++----------------------------- Cargo.toml | 6 +-- api.golden | 1 - src/main.rs | 29 ++++++++++--- 4 files changed, 76 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a0d4aff..d79227d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -142,13 +142,13 @@ dependencies = [ [[package]] name = "cargo-manifest" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d013e7f1d7783aa824b5096f12af7c583e58b7a169a04998d5fe20d940cbb9" +checksum = "bf6ff49a028a52bf61913e19f5ba3b9bd34145cc97eb1649865576c8f06b408d" dependencies = [ "serde", "thiserror", - "toml 0.7.8", + "toml", ] [[package]] @@ -197,9 +197,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -208,15 +208,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -234,9 +234,9 @@ dependencies = [ [[package]] name = "clap-num" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba5a37e6fe0166ba567c8bf32252ba96082781df7537066d977a5b84ce75250" +checksum = "0e063d263364859dc54fb064cedb7c122740cd4733644b14b176c097f51e8ab7" dependencies = [ "num-traits", ] @@ -368,6 +368,12 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "dissimilar" version = "1.0.7" @@ -515,9 +521,13 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "half" -version = "1.8.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbag" @@ -561,9 +571,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "cf2a4f498956c7723dc280afc6a37d0dec50b39a29e232c6187ce4503703e8c2" dependencies = [ "equivalent", "hashbrown", @@ -903,7 +913,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.4", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -918,9 +928,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -989,15 +999,15 @@ dependencies = [ [[package]] name = "rustdoc-json" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9847bf072651a163a36802e32267282811711ba40f5811ee0e7ff104d256e398" +checksum = "a21e727474edad247ba206da91e5d3f76c0ff4a4ddac1fb7bba508df49101388" dependencies = [ "cargo-manifest", "cargo_metadata", "serde", "thiserror", - "toml 0.8.8", + "toml", ] [[package]] @@ -1060,18 +1070,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -1080,9 +1090,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed" dependencies = [ "itoa", "ryu", @@ -1109,9 +1119,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "similar" @@ -1281,29 +1291,17 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - [[package]] name = "toml" version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ + "indexmap", "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit", ] [[package]] @@ -1315,19 +1313,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "toml_edit" version = "0.21.0" @@ -1405,9 +1390,9 @@ dependencies = [ [[package]] name = "tracing-tracy" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca0df0602d3ac1cfd7413bd4f463800fe076bf6b88698722aa763fe1561248b" +checksum = "6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614" dependencies = [ "tracing-core", "tracing-subscriber", @@ -1416,9 +1401,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.16.5" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307e6b7030112fe9640fdd87988a40795549ba75c355f59485d14e6b444d2987" +checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d" dependencies = [ "loom", "once_cell", @@ -1427,9 +1412,9 @@ dependencies = [ [[package]] name = "tracy-client-sys" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078c7ed72141b0e4369671a7f7af0eecffe18d753bf0296adca9c7add7276c9d" +checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" dependencies = [ "cc", ] @@ -1447,7 +1432,7 @@ dependencies = [ "serde", "shlex", "snapbox", - "toml_edit 0.21.0", + "toml_edit", ] [[package]] @@ -1751,9 +1736,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index ae0616d..57763fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ license = "Apache-2.0" bytesize = "1.3.0" cfg-if = "1.0.0" clap = { version = "4.4.18", features = ["derive", "wrap_help"] } -clap-num = "1.1.0" +clap-num = "1.1.1" clap-verbosity-flag2 = "2.1.1" error-stack = "0.4.1" io-adapters = "0.3.0" @@ -30,8 +30,8 @@ tokio = { version = "1.35.1", features = ["rt"] } tracing = { version = "0.1.40", features = ["release_max_level_off", "log"], optional = true } tracing-log = { version = "0.2.0", optional = true } tracing-subscriber = { version = "0.3.18", optional = true } -tracing-tracy = { version = "0.10.5", optional = true } -tracy-client = { version = "0.16.5", optional = true } +tracing-tracy = { version = "0.11.0", features = ["flush-on-exit"], optional = true } +tracy-client = { version = "0.17.0", optional = true } typed-builder = "0.18.1" [target.'cfg(unix)'.dependencies] diff --git a/api.golden b/api.golden index 0818956..88f0511 100644 --- a/api.golden +++ b/api.golden @@ -176,7 +176,6 @@ pub fn ftzz::NumFilesWithRatio::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> impl core::hash::Hash for ftzz::NumFilesWithRatio pub fn ftzz::NumFilesWithRatio::hash<__H: core::hash::Hasher>(&self, state: &mut __H) impl core::marker::Copy for ftzz::NumFilesWithRatio -impl core::marker::StructuralEq for ftzz::NumFilesWithRatio impl core::marker::StructuralPartialEq for ftzz::NumFilesWithRatio impl core::marker::Send for ftzz::NumFilesWithRatio impl core::marker::Sync for ftzz::NumFilesWithRatio diff --git a/src/main.rs b/src/main.rs index 2f57390..883927d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -226,14 +226,31 @@ fn main() -> ExitCode { #[cfg(feature = "trace")] { use tracing_log::AsTrace; - use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; + use tracing_subscriber::{ + fmt::format::DefaultFields, layer::SubscriberExt, util::SubscriberInitExt, + }; + + #[derive(Default)] + struct Config(DefaultFields); + + impl tracing_tracy::Config for Config { + type Formatter = DefaultFields; + + fn formatter(&self) -> &Self::Formatter { + &self.0 + } + + fn stack_depth(&self, _: &tracing::Metadata<'_>) -> u16 { + 32 + } + + fn format_fields_in_zone_name(&self) -> bool { + false + } + } tracing_subscriber::registry() - .with( - tracing_tracy::TracyLayer::new() - .with_stackdepth(32) - .with_fields_in_zone_name(false), - ) + .with(tracing_tracy::TracyLayer::new(Config::default())) .with(tracing::level_filters::LevelFilter::from(level.as_trace())) .init(); };