diff --git a/rust/Cargo.lock b/rust/Cargo.lock index cdf09e7f4..dd05feefd 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2743,19 +2743,6 @@ dependencies = [ "x11", ] -[[package]] -name = "generator" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" -dependencies = [ - "cfg-if", - "libc", - "log", - "rustversion", - "windows 0.58.0", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -3794,19 +3781,6 @@ version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" -[[package]] -name = "loom" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - [[package]] name = "lru" version = "0.12.5" @@ -3951,23 +3925,21 @@ dependencies = [ [[package]] name = "moka" -version = "0.12.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" +version = "0.12.11" +source = "git+https://github.com/moka-rs/moka?branch=main#8dbc8e5c6ee804470b1144960f4065959658232a" dependencies = [ "async-lock", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", + "equivalent", "event-listener", "futures-util", - "loom", "parking_lot", "portable-atomic", "rustc_version", "smallvec", "tagptr", - "thiserror 1.0.69", "uuid", ] @@ -5820,12 +5792,6 @@ dependencies = [ "syn 2.0.87", ] -[[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.2.0" @@ -8164,7 +8130,7 @@ dependencies = [ "windows 0.61.1", "windows-core 0.61.0", "windows-implement 0.60.0", - "windows-interface 0.59.1", + "windows-interface", ] [[package]] @@ -8263,16 +8229,6 @@ dependencies = [ "windows-version", ] -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.60.0" @@ -8317,19 +8273,6 @@ dependencies = [ "windows-core 0.61.0", ] -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings 0.1.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.60.1" @@ -8337,7 +8280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247" dependencies = [ "windows-implement 0.59.0", - "windows-interface 0.59.1", + "windows-interface", "windows-link", "windows-result 0.3.2", "windows-strings 0.3.1", @@ -8350,7 +8293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" dependencies = [ "windows-implement 0.60.0", - "windows-interface 0.59.1", + "windows-interface", "windows-link", "windows-result 0.3.2", "windows-strings 0.4.0", @@ -8376,17 +8319,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - [[package]] name = "windows-implement" version = "0.59.0" @@ -8409,17 +8341,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - [[package]] name = "windows-interface" version = "0.59.1" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 6f4a928ec..54efc6f2d 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -102,7 +102,7 @@ lockfree-object-pool = "0.1.6" log = "0.4" lru = "0.12.5" mio = "1.0.3" -moka = "0.12.10" +moka = "0.12.11" native-dialog = "0.7.0" network-types = "0.0.8" nix = "0.29.0" @@ -216,6 +216,7 @@ ip_network_table = { git = "https://github.com/edmonds/ip_network_table", branch tracing-stackdriver = { git = "https://github.com/thomaseizinger/tracing-stackdriver", branch = "bump-otel-0.29" } # Waiting for release. softbuffer = { git = "https://github.com/rust-windowing/softbuffer" } # Waiting for release. str0m = { git = "https://github.com/algesten/str0m", branch = "main" } +moka = { git = "https://github.com/moka-rs/moka", branch = "main" } # Waiting for release. # Enforce `tracing-macros` to have released `tracing` version. [patch.'https://github.com/tokio-rs/tracing'] diff --git a/rust/deny.toml b/rust/deny.toml index 79a5893f7..85b05efbb 100644 --- a/rust/deny.toml +++ b/rust/deny.toml @@ -274,7 +274,6 @@ skip = [ "windows-core", "windows-future", "windows-implement", - "windows-interface", "windows-numerics", "windows-result", "windows-strings",