From 04b38521ce577b99c33ad7b117f43df860c7904d Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 1 Aug 2024 12:00:00 +0000 Subject: [PATCH] update further dependencies --- Cargo.lock | 20 ++++++++++++------- Cargo.nix | 58 ++++++++++++++++++++++++++++++++++++++++-------------- Cargo.toml | 4 ++-- 3 files changed, 58 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d081fe..b403cb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -283,11 +283,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown", "lock_api", "once_cell", @@ -674,7 +675,7 @@ dependencies = [ "scarlet", "versions", "walkdir", - "which 5.0.0", + "which 6.0.2", ] [[package]] @@ -1195,15 +1196,14 @@ dependencies = [ [[package]] name = "which" -version = "5.0.0" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" dependencies = [ "either", "home", - "once_cell", "rustix", - "windows-sys 0.48.0", + "winsafe", ] [[package]] @@ -1364,6 +1364,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "zerocopy" version = "0.6.6" diff --git a/Cargo.nix b/Cargo.nix index dbdcfac..fb33729 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -827,9 +827,9 @@ rec { }; "dashmap" = rec { crateName = "dashmap"; - version = "5.5.3"; + version = "6.0.1"; edition = "2018"; - sha256 = "0miqnlxi501vfbv6mw5jbmzgnj0wjrch3p4abvpd59s9v30lg1wp"; + sha256 = "0a5fmh96flvccnv3595ri50rl3swz9gsfaqc4dq8ngqcawhqhk40"; authors = [ "Acrimon " ]; @@ -838,10 +838,15 @@ rec { name = "cfg-if"; packageId = "cfg-if"; } + { + name = "crossbeam-utils"; + packageId = "crossbeam-utils"; + } { name = "hashbrown"; packageId = "hashbrown"; usesDefaultFeatures = false; + features = [ "raw" ]; } { name = "lock_api"; @@ -2001,7 +2006,7 @@ rec { } { name = "which"; - packageId = "which 5.0.0"; + packageId = "which 6.0.2"; } ]; @@ -3552,11 +3557,11 @@ rec { "regex" = [ "dep:regex" ]; }; }; - "which 5.0.0" = rec { + "which 6.0.2" = rec { crateName = "which"; - version = "5.0.0"; + version = "6.0.2"; edition = "2021"; - sha256 = "053fpbczryyn8lcbpkvwl8v2rzld0pr30r5lh1cxv87kjs2ymwwv"; + sha256 = "0xah27xv2c0zrr2kf7mvj1m0046j8d9j49xnngnif7zfd3b5x71x"; authors = [ "Harry Fei " ]; @@ -3570,26 +3575,23 @@ rec { packageId = "home"; target = { target, features }: ((target."windows" or false) || (target."unix" or false) || ("redox" == target."os" or null)); } - { - name = "once_cell"; - packageId = "once_cell"; - target = { target, features }: (target."windows" or false); - } { name = "rustix"; packageId = "rustix"; usesDefaultFeatures = false; + target = { target, features }: ((target."unix" or false) || ("wasi" == target."os" or null) || ("redox" == target."os" or null)); features = [ "fs" "std" ]; } { - name = "windows-sys"; - packageId = "windows-sys 0.48.0"; + name = "winsafe"; + packageId = "winsafe"; target = { target, features }: (target."windows" or false); - features = [ "Win32_Storage_FileSystem" "Win32_Foundation" ]; + features = [ "kernel" ]; } ]; features = { "regex" = [ "dep:regex" ]; + "tracing" = [ "dep:tracing" ]; }; }; "wide" = rec { @@ -3925,7 +3927,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "default" ]; + resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_System" "Win32_System_Console" "default" ]; }; "windows-sys 0.52.0" = rec { crateName = "windows-sys"; @@ -4424,6 +4426,32 @@ rec { ]; }; + "winsafe" = rec { + crateName = "winsafe"; + version = "0.0.19"; + edition = "2021"; + sha256 = "0169xy9mjma8dys4m8v4x0xhw2gkbhv2v1wsbvcjl9bhnxxd2dfi"; + authors = [ + "Rodrigo Cesar de Freitas Dias " + ]; + features = { + "comctl" = [ "ole" ]; + "dshow" = [ "oleaut" ]; + "dwm" = [ "uxtheme" ]; + "dxgi" = [ "ole" ]; + "gdi" = [ "user" ]; + "gui" = [ "comctl" "shell" "uxtheme" ]; + "mf" = [ "oleaut" ]; + "ole" = [ "user" ]; + "oleaut" = [ "ole" ]; + "shell" = [ "oleaut" ]; + "taskschd" = [ "oleaut" ]; + "user" = [ "kernel" ]; + "uxtheme" = [ "gdi" "ole" ]; + "version" = [ "kernel" ]; + }; + resolvedDefaultFeatures = [ "kernel" ]; + }; "zerocopy" = rec { crateName = "zerocopy"; version = "0.6.6"; diff --git a/Cargo.toml b/Cargo.toml index 4a77d04..e18c508 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ scarlet = "1" walkdir = "2" enum-map = "2" rayon = "1" -dashmap = "5" +dashmap = "6" indicatif = "0.17" lazy_static = "1" regex = "1" @@ -38,4 +38,4 @@ features = ["derive", "suggestions", "color", "wrap_help"] [dev-dependencies] rand = "0.8" cli_test_dir = "0.1" -which = "5" +which = "6"