From 54eb33df87410bce796a2b4595b0a0796f1c7fed Mon Sep 17 00:00:00 2001 From: Brett Mayson Date: Thu, 4 May 2023 23:26:28 -0600 Subject: [PATCH] update deps, remove tracy --- Cargo.lock | 157 ++++++-------------------------- Cargo.toml | 8 +- bin/Cargo.toml | 9 +- bin/src/error.rs | 1 + bin/src/lib.rs | 9 +- bin/src/logging.rs | 15 +-- libs/config/src/model/number.rs | 2 +- 7 files changed, 43 insertions(+), 158 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f9867db2..c114de2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "atty" @@ -266,18 +266,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.2" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.2.2" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", @@ -694,19 +694,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generator" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -787,7 +774,7 @@ dependencies = [ "ansi_term", "anyhow", "atty", - "clap 4.2.2", + "clap 4.2.7", "colored", "dialoguer", "fs_extra", @@ -814,7 +801,6 @@ dependencies = [ "toml", "tracing", "tracing-subscriber", - "tracing-tracy", "vfs", "walkdir", "whoami", @@ -1200,28 +1186,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - [[package]] name = "memchr" version = "2.5.0" @@ -1477,9 +1441,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" +checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" dependencies = [ "thiserror", "ucd-trie", @@ -1487,9 +1451,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" +checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" dependencies = [ "pest", "pest_generator", @@ -1497,9 +1461,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" +checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" dependencies = [ "pest", "pest_meta", @@ -1510,9 +1474,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" +checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" dependencies = [ "once_cell", "pest", @@ -1709,15 +1673,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax", -] - [[package]] name = "regex-syntax" version = "0.6.29" @@ -1726,9 +1681,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "base64", "bytes", @@ -1763,9 +1718,9 @@ dependencies = [ [[package]] name = "rhai" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd29fa1f740be6dc91982013957e08c3c4232d7efcfe19e12da87d50bad47758" +checksum = "b2c99b27f6661b4d217b6aa21727c6a0808729266edfc8a8877042d609b1904e" dependencies = [ "ahash", "bitflags", @@ -1855,12 +1810,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rustversion" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - [[package]] name = "ryu" version = "1.0.13" @@ -1885,12 +1834,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.1.0" @@ -1928,18 +1871,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2", "quote", @@ -2334,13 +2277,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -2376,56 +2319,21 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ - "matchers", "nu-ansi-term", - "once_cell", - "regex", "serde", "serde_json", "sharded-slab", "smallvec", "thread_local", - "tracing", "tracing-core", "tracing-log", "tracing-serde", ] -[[package]] -name = "tracing-tracy" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e" -dependencies = [ - "tracing-core", - "tracing-subscriber", - "tracy-client", -] - -[[package]] -name = "tracy-client" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608" -dependencies = [ - "loom", - "once_cell", - "tracy-client-sys", -] - -[[package]] -name = "tracy-client-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d99f5fc382239d08b6bf05bb6206a585bfdb988c878f2499081d0f285ef7819" -dependencies = [ - "cc", -] - [[package]] name = "try-lock" version = "0.2.4" @@ -2655,15 +2563,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.42.0" diff --git a/Cargo.toml b/Cargo.toml index 6220190a..2a4c81ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,13 +13,13 @@ members = [ ] [workspace.dependencies] -clap = "4.2.2" +clap = "4.2.7" colored = "2.0.0" git2 = "0.17.1" peekmore = "1.2.1" -pest = "2.5.7" -pest_derive = "2.5.7" -serde = { version = "1.0.160", features = ["derive"] } +pest = "2.6.0" +pest_derive = "2.6.0" +serde = { version = "1.0.162", features = ["derive"] } serde_json = "1.0.96" sha-1 = "0.10.1" toml = "0.7.3" diff --git a/bin/Cargo.toml b/bin/Cargo.toml index 32cce18c..0e5094e7 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -17,7 +17,7 @@ hemtt-signing = { path = "../libs/signing", version = "1.0.0" } hemtt-version = { path = "../libs/version", version = "1.0.0" } ansi_term = "0.12.1" -anyhow = "1.0.70" +anyhow = "1.0.71" atty = "0.2.14" clap = { workspace = true } colored = { workspace = true } @@ -28,8 +28,8 @@ glob = "0.3.1" num_cpus = "1.15.0" peekmore = { workspace = true } rayon = "1.7.0" -reqwest = { version = "0.11.16", features = ["blocking", "json"] } -rhai = "1.13.0" +reqwest = { version = "0.11.17", features = ["blocking", "json"] } +rhai = "1.14.0" rust-embed = "6.6.1" semver = "1.0.17" serde = { workspace = true, features = ["derive"] } @@ -38,8 +38,7 @@ steamlocate = "2.0.0-alpha.0" time = "0.3.20" toml = { workspace = true } tracing = { workspace = true } -tracing-subscriber = { version = "0.3.16", features = ["json"] } -tracing-tracy = "0.10.2" +tracing-subscriber = { version = "0.3.17", features = ["json"] } vfs = { workspace = true } walkdir = { workspace = true } whoami = "1.4.0" diff --git a/bin/src/error.rs b/bin/src/error.rs index d222851d..8626273a 100644 --- a/bin/src/error.rs +++ b/bin/src/error.rs @@ -21,6 +21,7 @@ pub enum Error { AddonOptionalNotFound(String), #[error("Unable to create link: {0}")] + #[allow(dead_code)] // Unused on Linux and Mac Link(String), #[error("Arma 3 not found in Steam")] Arma3NotFound, diff --git a/bin/src/lib.rs b/bin/src/lib.rs index 288bbe5d..bd41a06a 100644 --- a/bin/src/lib.rs +++ b/bin/src/lib.rs @@ -47,13 +47,6 @@ pub fn cli() -> Command { .action(ArgAction::Count) .short('v'), ); - global = global.arg( - clap::Arg::new("trace") - .global(true) - .help("Enable trace logging") - .action(ArgAction::SetTrue) - .long("trace"), - ); #[cfg(debug_assertions)] { global = global.arg( @@ -76,7 +69,7 @@ pub fn cli() -> Command { /// If the number passed to `--threads` is not a valid number pub fn execute(matches: &ArgMatches) -> Result<(), AppError> { if cfg!(not(debug_assertions)) || !matches.get_flag("in-test") { - logging::init(matches.get_count("verbosity"), matches.get_flag("trace")); + logging::init(matches.get_count("verbosity")); } if !is_ci() { diff --git a/bin/src/logging.rs b/bin/src/logging.rs index 644b346b..b217cb72 100644 --- a/bin/src/logging.rs +++ b/bin/src/logging.rs @@ -8,7 +8,7 @@ use tracing_subscriber::{ prelude::__tracing_subscriber_SubscriberExt, util::SubscriberInitExt, Layer, }; -pub fn init(verbosity: u8, trace: bool) { +pub fn init(verbosity: u8) { let format = tracing_subscriber::fmt::format() .without_time() .with_target(false) @@ -35,14 +35,7 @@ pub fn init(verbosity: u8, trace: bool) { .with_target(false) .with_ansi(false); - if trace { - tracing_subscriber::registry() - .with(stdout.with_filter(filter).and_then(debug_log)) - .with(tracing_tracy::TracyLayer::new()) - .init(); - } else { - tracing_subscriber::registry() - .with(stdout.with_filter(filter).and_then(debug_log)) - .init(); - } + tracing_subscriber::registry() + .with(stdout.with_filter(filter).and_then(debug_log)) + .init(); } diff --git a/libs/config/src/model/number.rs b/libs/config/src/model/number.rs index 3ae0405b..a0c60717 100644 --- a/libs/config/src/model/number.rs +++ b/libs/config/src/model/number.rs @@ -284,7 +284,7 @@ mod tests { &Token::builtin(None), ) .unwrap(); - assert_eq!(number, super::Number::Int64(0x1234_5678_90)); + assert_eq!(number, super::Number::Int64(0x0012_3456_7890)); } #[test]