diff --git a/Cargo.lock b/Cargo.lock index bcfb506431..15b8f3787a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -555,9 +555,9 @@ dependencies = [ [[package]] name = "bollard" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d0a013e3d3ee4edd61e779adf117944c08902d375f18630a0c5b8f95659734" +checksum = "dbe8358268799ebb3e4df23cb9d47f4c72bbc4f5247e2fa6a1bf7b6c0baea220" dependencies = [ "base64", "bollard-stubs", @@ -692,9 +692,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.4.2" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d262e149917187838d5b42777c8253bcb64500067342904e7d429499a6f277e" +checksum = "0ad534f4357a5264cce5019c989cf66a4f0dc4e0d1b1d15f8aacec0ff7360273" dependencies = [ "find-msvc-tools", "jobserver", @@ -864,7 +864,7 @@ dependencies = [ "eyre", "indenter", "once_cell", - "owo-colors 4.3.0", + "owo-colors", "tracing-error", ] @@ -875,7 +875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8b88ea9df13354b55bc7234ebcce36e6ef896aca2e42a15de9e10edce01b427" dependencies = [ "once_cell", - "owo-colors 4.3.0", + "owo-colors", "tracing-core", "tracing-error", ] @@ -892,7 +892,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -980,9 +980,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +checksum = "8498c871161e1742aaa9d52551b2d6ebdd4c3d45a3be423e3728f33b955be550" dependencies = [ "cfg-if", ] @@ -1292,7 +1292,7 @@ dependencies = [ "reedline", "regex", "rkyv", - "strum 0.28.0", + "strum", "thiserror", ] @@ -1469,7 +1469,7 @@ dependencies = [ "rkyv", "serde", "serde_yaml_ng", - "strum 0.28.0", + "strum", "thiserror", "tokio", "tracing", @@ -1496,8 +1496,8 @@ dependencies = [ "dataplane-sysfs", "nix 0.31.3", "procfs", - "strum 0.28.0", - "strum_macros 0.28.0", + "strum", + "strum_macros", "thiserror", "tracing", "tracing-subscriber", @@ -1705,7 +1705,7 @@ dependencies = [ "rand 0.10.2", "roaring", "shuttle", - "strum 0.28.0", + "strum", "thiserror", "tokio", "tracing", @@ -1734,8 +1734,8 @@ dependencies = [ "rkyv", "serde", "static_assertions", - "strum 0.28.0", - "strum_macros 0.28.0", + "strum", + "strum_macros", "thiserror", "tokio-util", "tracing", @@ -1752,7 +1752,7 @@ dependencies = [ "dyn-iter", "linkme", "ordermap", - "strum 0.28.0", + "strum", "thiserror", "tracing", ] @@ -1798,7 +1798,7 @@ dependencies = [ "procfs", "rand 0.10.2", "serde", - "strum 0.28.0", + "strum", "thiserror", "tokio", "tokio-util", @@ -2127,9 +2127,9 @@ dependencies = [ [[package]] name = "either" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d" +checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34" [[package]] name = "encoding_rs" @@ -2202,7 +2202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2247,10 +2247,11 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.12" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +checksum = "c08309dbcc659c5549a24ddb9b27027640641b282ef5768267c7e675558986a3" dependencies = [ + "autocfg", "indenter", "once_cell", ] @@ -2289,9 +2290,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b73573e6edcd2af0cdf47bd6cb58f0b3839491263c314eaad1ccf24430e1de" +checksum = "d45db016d36b838f563236e9193d0ee6ce38f3f68b6c94e914b4929c96bbb890" [[package]] name = "findshlibs" @@ -2384,9 +2385,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88cf1f829d945f548cf8fec32c61b1f202b6d93b45848602fc02af4b12ad218" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", @@ -2399,9 +2400,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -2409,15 +2410,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" dependencies = [ "futures-core", "futures-task", @@ -2426,9 +2427,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-lite" @@ -2447,32 +2448,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] name = "futures-sink" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-channel", "futures-core", @@ -2582,9 +2583,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f37a958b41b3b19ee2707c06439c0e9e547e847223eb791ecb0cb821c65e27" +checksum = "839c0e8a181239723652be9062bb56ca5bf5f64011f73b623f6f4fc59086a228" dependencies = [ "atomic-waker", "bytes", @@ -2696,9 +2697,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" dependencies = [ "bytes", "futures-core", @@ -2731,7 +2732,7 @@ dependencies = [ "errno", "hwlocality-sys", "libc", - "strum 0.28.0", + "strum", "thiserror", "windows-sys 0.61.2", ] @@ -2886,9 +2887,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" dependencies = [ "displaydoc", "potential_utf", @@ -2900,9 +2901,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" dependencies = [ "displaydoc", "litemap", @@ -2913,9 +2914,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -2927,16 +2928,17 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -2947,15 +2949,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" dependencies = [ "displaydoc", "icu_locale_core", @@ -3011,9 +3013,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8" +checksum = "4cc00ea907cab49550b7da656f80ebb97be1b997d931fbcd28d39734e17ce592" dependencies = [ "bitflags 2.13.1", "futures-util", @@ -3079,6 +3081,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.18" @@ -3453,9 +3464,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "litrs" @@ -3474,9 +3485,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "loom" @@ -3609,7 +3620,7 @@ dependencies = [ "backtrace-ext", "cfg-if", "miette-derive", - "owo-colors 4.3.0", + "owo-colors", "supports-color", "supports-hyperlinks", "supports-unicode", @@ -3740,9 +3751,9 @@ dependencies = [ [[package]] name = "netdev" -version = "0.46.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5837045c9eeadc61432b095a6b10debefc0609241657771a194d48b2f39520" +checksum = "3a5f88621a4b468e8ce92626f847cc02462cef3e06d793baa8b1c8617e304b20" dependencies = [ "block2", "dispatch2", @@ -3770,7 +3781,7 @@ dependencies = [ "netgauze-iana", "netgauze-parse-utils", "serde", - "strum_macros 0.28.0", + "strum_macros", "thiserror", ] @@ -3789,7 +3800,7 @@ dependencies = [ "netgauze-iana", "netgauze-parse-utils", "serde", - "strum_macros 0.28.0", + "strum_macros", "thiserror", "tokio-util", ] @@ -3801,7 +3812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bd05c4522521b260b0f1ae400239d65616c014b9cd0802de68ea9dcedd6d056" dependencies = [ "serde", - "strum_macros 0.28.0", + "strum_macros", ] [[package]] @@ -3861,9 +3872,9 @@ dependencies = [ [[package]] name = "netlink-proto" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f7398dddf5f152d2a91a2921a134c6097056e292c0d4b9906007855e7cece6" +checksum = "93af8261786086024cd5e96e0a991dd65ced07bbf7c233a487bbc96b971d5539" dependencies = [ "bytes", "futures-channel", @@ -3944,7 +3955,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4083,12 +4094,6 @@ dependencies = [ "indexmap", ] -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - [[package]] name = "owo-colors" version = "4.3.0" @@ -4190,9 +4195,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df728be843c7070fab6ab7c328c4e9e9d78e23bf749c0669c86ee7ebfa050a2" +checksum = "5a07a60cc7a4d00c91f95c685609d1d2f79050e6804b70ebedd7650f0b839bcf" dependencies = [ "memchr", "ucd-trie", @@ -4200,9 +4205,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2dd6fc3b26b3462ee188aac870f5a41d398f1cd5e2408d16531bd71c9591fd" +checksum = "b3a83744a5c8455b8b3e0dc5031362780a347c878bdd11584d1a8984228cc88d" dependencies = [ "pest", "pest_generator", @@ -4210,9 +4215,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7a9205cfb6f596a9e8b689c0a15f9ceb7a1aafae7aaf788150ac65b29975b6" +checksum = "e0cd3451aa3de60d4b9a1e736885e4dea6b31617598026f12256ad566d63304a" dependencies = [ "pest", "pest_meta", @@ -4223,9 +4228,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85abd351c0de1e8384fc791a0737111a350394937e92b956b743dac12429f57c" +checksum = "e04d3a0849e241d7dfce834c83b1c5edc8622009e8dd51a12ba1927c32f05496" dependencies = [ "pest", ] @@ -4296,9 +4301,9 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "plist" @@ -4330,9 +4335,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ "zerovec", ] @@ -4706,18 +4711,18 @@ dependencies = [ [[package]] name = "reedline" -version = "0.49.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826c1fc22a2b1f14c3f6a80fc3d56adfbfb913d07f170bce4246700de7adfd50" +checksum = "d010acf9ed312cbc737e5f9064c375a7093975b0c25568337f0c24148f46540d" dependencies = [ "chrono", "crossterm", "fd-lock", - "itertools 0.13.0", + "itertools 0.15.0", "nu-ansi-term", "serde", "strip-ansi-escapes", - "strum 0.27.2", + "strum", "thiserror", "unicase", "unicode-segmentation", @@ -4726,18 +4731,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216e8f773d7923bcba9ceb86a86c93cabb3903a11872fc3f138c49630e50b96d" +checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9283685feec7d69af75fb0e858d5e7378f33fe4fc699383b2916ab9273e03c" +checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", @@ -4867,9 +4872,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "roaring" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dedc5658c6ecb3bdb5ef5f3295bb9253f42dcf3fd1402c03f6b1f7659c3c4a9" +checksum = "18bd8a37d17a58532776dcdf6041ce64929adca78e8489d5cacbafe99229d3e1" [[package]] name = "rtnetlink" @@ -4920,7 +4925,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4977,7 +4982,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4988,9 +4993,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.13" +version = "0.103.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" dependencies = [ "aws-lc-rs", "ring", @@ -5302,9 +5307,31 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "shuttle" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba93071c1b720be2505f4c8ce2863502cb9a26a3819e268df1932458a755152c" +checksum = "786792d8bc94c770b53a938f0ae68726387a3a0a3762f9cc2c38d5e1bb40f0c0" +dependencies = [ + "bitvec", + "cfg-if", + "const-siphasher", + "corosensei", + "hex", + "owo-colors", + "rand 0.8.7", + "rand_core 0.6.4", + "rand_pcg", + "scoped-tls", + "shuttle-engine", + "shuttle-schedulers", + "shuttle-std", + "tracing", +] + +[[package]] +name = "shuttle-engine" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb03d6daa3cf319f53bef382ee4431203c770912209703452033d19fb71e813b" dependencies = [ "assoc", "bitvec", @@ -5312,7 +5339,7 @@ dependencies = [ "const-siphasher", "corosensei", "hex", - "owo-colors 3.5.0", + "owo-colors", "rand 0.8.7", "rand_core 0.6.4", "rand_pcg", @@ -5321,6 +5348,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "shuttle-schedulers" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7673a579e1660404067f5aa1344d6530f15b59f53b0fe98767d7ab117d14067" +dependencies = [ + "rand 0.8.7", + "rand_pcg", + "shuttle-engine", + "smallvec", + "tracing", +] + +[[package]] +name = "shuttle-std" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4a3088fd2d19e5ebc24bc3779bc85a68228fafde2d87d138e475b8591dc721" +dependencies = [ + "assoc", + "owo-colors", + "shuttle-engine", + "smallvec", + "tracing", +] + [[package]] name = "signal-hook" version = "0.3.18" @@ -5422,9 +5475,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8abadc99fd9c7bbb7d0ca2b31d72a067d0c0dcd7aad25ab8cac71ba91417694b" +checksum = "0134f9043ed38b087ac4f7d4af44c79e2c9e5094421fe3164f435ce585953b10" dependencies = [ "lock_api", ] @@ -5456,34 +5509,13 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" -dependencies = [ - "strum_macros 0.27.2", -] - [[package]] name = "strum" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" dependencies = [ - "strum_macros 0.28.0", -] - -[[package]] -name = "strum_macros" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.119", + "strum_macros", ] [[package]] @@ -5616,7 +5648,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5626,7 +5658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5700,9 +5732,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" dependencies = [ "displaydoc", "zerovec", @@ -6151,9 +6183,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.24.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" +checksum = "f053576934f05a761a402421fbbe3d425d9366f75f978806a037b3ca481abecc" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -6329,7 +6361,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6520,9 +6552,9 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" [[package]] name = "wyz" @@ -6617,9 +6649,9 @@ checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" dependencies = [ "displaydoc", "yoke", @@ -6628,9 +6660,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" dependencies = [ "yoke", "zerofrom", @@ -6639,13 +6671,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 686c76a128..7db5d56b0f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -141,14 +141,14 @@ doxygen-bindgen = { version = "0.1.4", default-features = false, features = [] } dyn-iter = { version = "1.0.1", default-features = false, features = [] } etherparse = { version = "0.21.0", default-features = false, features = [] } fixin = { git = "https://github.com/githedgehog/fixin", branch = "main", features = [] } -futures = { version = "0.3.33", default-features = false, features = [] } -futures-util = { version = "0.3.33", default-features = false, features = [] } +futures = { version = "0.3.34", default-features = false, features = [] } +futures-util = { version = "0.3.34", default-features = false, features = [] } hashbrown = { version = "0.17.1", default-features = false, features = [] } hwlocality = { version = "1.0.0-alpha.12", default-features = false, features = [] } hyper = { version = "1.11.0", default-features = false, features = [] } hyper-util = { version = "0.1.20", default-features = false, features = [] } indenter = { version = "0.3.4", default-features = false, features = [] } -inotify = { version = "0.11.4", default-features = false, features = [] } +inotify = { version = "0.11.5", default-features = false, features = [] } ipnet = { version = "2.12.1", default-features = false, features = [] } k8s-openapi = { version = "0.28.0", default-features = false, features = [] } kanal = { version = "0.1.1", default-features = false, features = [] } @@ -158,7 +158,7 @@ kube-core = { version = "4.2.0", default-features = false, features = [] } left-right = { git = "https://github.com/githedgehog/left-right.git", branch = "fredi/fix-writehandle-drop", default-features = false, features = [] } libc = { version = "0.2.189", default-features = false, features = [] } linkme = { version = "0.3.37", default-features = false, features = [] } -log = { version = "0.4.33", default-features = false, features = [] } # TODO: try to remove this +log = { version = "0.4.34", default-features = false, features = [] } # TODO: try to remove this loom = { version = "0.7.2", default-features = false, features = [] } memmap2 = { version = "0.9.11", default-features = false, features = [] } metrics = { version = "0.24.6", default-features = false, features = [] } @@ -167,7 +167,7 @@ miette = { version = "7.6.0", default-features = false, features = [] } mio = { version = "1.2.2", default-features = false, features = [] } multi_index_map = { version = "0.15.1", default-features = false, features = [] } n-vm = { git = "https://github.com/githedgehog/testn.git", tag = "v0.0.10", default-features = false, features = [], package = "n-vm" } -netdev = { version = "0.46.0", default-features = false, features = [] } +netdev = { version = "0.46.1", default-features = false, features = [] } netgauze-bgp-pkt = { version = "0.13.0", features = [] } netgauze-bmp-pkt = { version = "0.13.0", features = [] } nix = { version = "0.31.3", default-features = false, features = [] } @@ -187,10 +187,10 @@ pyroscope = { version = "2.1.1", default-features = false, features = [] } quote = { version = "1.0.47", default-features = false, features = [] } rand = { version = "0.10.2", default-features = false, features = [] } rapidhash = { version = "4.5.1", default-features = false, features = [] } -reedline = { version = "0.49.0", default-features = false, features = [] } +reedline = { version = "0.51.0", default-features = false, features = [] } regex = { version = "1.13.1", default-features = false, features = [] } rkyv = { version = "0.8.18", default-features = false, features = [] } -roaring = { version = "0.11.4", default-features = false, features = [] } +roaring = { version = "0.11.5", default-features = false, features = [] } rtnetlink = { git = "https://github.com/githedgehog/rtnetlink.git", branch = "hh/tc-actions4", default-features = false, features = [] } rustls = { version = "0.23.43", default-features = false, features = [] } schemars = { version = "1", default-features = false, features = [] } @@ -199,7 +199,7 @@ serde_json = { version = "1.0.151", default-features = false, features = [] } serde_yaml_ng = { version = "0.10.0", default-features = false, features = [] } serial_test = { version = "4.0.1", default-features = false, features = [] } sha2 = { version = "0.11.0", default-features = false, features = [] } -shuttle = { version = "0.9.1", default-features = false, features = [] } +shuttle = { version = "0.9.3", default-features = false, features = [] } small-map = { version = "0.1.5", default-features = false, features = [] } static_assertions = { version = "1.1.0", default-features = false, features = [] } strum = { version = "0.28.0", default-features = false, features = [] } @@ -222,7 +222,7 @@ tracing-subscriber = { version = "0.3.23", default-features = false, features = tracing-test = { version = "0.2.6", default-features = false, features = [] } ureq = { version = "3.4.0", default-features = false, features = [] } url = { version = "2.5.8", default-features = false, features = [] } -uuid = { version = "1.24.0", default-features = false, features = [] } +uuid = { version = "1.25.0", default-features = false, features = [] } # NOTE: panic strategy is intentionally left unset here. # diff --git a/cli/bin/completions.rs b/cli/bin/completions.rs index 8b757da0d4..b6ea8ce10a 100644 --- a/cli/bin/completions.rs +++ b/cli/bin/completions.rs @@ -5,7 +5,7 @@ use crate::cmdtree::Node; use concurrency::sync::Arc; -use reedline::{Completer, Span, Suggestion}; +use reedline::{Completer, CompletionResult, Span, Suggestion}; #[derive(Default)] pub struct CmdCompleter { @@ -35,8 +35,12 @@ fn suggestion(value: String, span: Span) -> Suggestion { } } -impl Completer for CmdCompleter { - fn complete(&mut self, line: &str, pos: usize) -> Vec { +impl CmdCompleter { + /// Every candidate this completer can offer for `line[..pos]`. + /// + /// The whole command tree is already in memory, so there is never a + /// partial answer to report: the caller can always treat this as final. + fn candidates(&self, line: &str, pos: usize) -> Vec { let input = &line[..pos]; let tokens: Vec = input.split_whitespace().map(ToString::to_string).collect(); let mut candidates = Vec::new(); @@ -120,3 +124,9 @@ impl Completer for CmdCompleter { .collect() } } + +impl Completer for CmdCompleter { + fn complete(&mut self, line: &str, pos: usize) -> CompletionResult { + CompletionResult::fresh(self.candidates(line, pos)) + } +} diff --git a/interface-manager/src/monitor/mod.rs b/interface-manager/src/monitor/mod.rs index f7a06c5962..b76e745040 100644 --- a/interface-manager/src/monitor/mod.rs +++ b/interface-manager/src/monitor/mod.rs @@ -120,14 +120,13 @@ impl InterfaceMonitor { /// # Errors /// /// This method fails if a netlink connection cannot be created. - pub async fn run(monitor: Arc) -> Result<(), ()> { + pub async fn run(monitor: Arc) -> std::io::Result<()> { info!("Starting interface monitor"); for i in &monitor.tracked { info!("Will track status of interface {i}"); } let (conn, _, mut messages) = rtnetlink::new_multicast_connection(&[MulticastGroup::Link]) - .inspect_err(|e| error!("Failed to open netlink connection: {e}")) - .map_err(|_| ())?; + .inspect_err(|e| error!("Failed to open netlink connection: {e}"))?; tokio::spawn(conn); diff --git a/match-action-derive/src/lib.rs b/match-action-derive/src/lib.rs index d11fe60f7d..4da63cf065 100644 --- a/match-action-derive/src/lib.rs +++ b/match-action-derive/src/lib.rs @@ -287,11 +287,17 @@ fn expand(input: &DeriveInput) -> syn::Result { } }) .collect::>()?; + // The `FixedSize` predicates pushed above are what let a wrapper field carry a + // non-`FixedSize` parameter, but on a non-generic key every one of them names a + // concrete type. A trivial bound in an item's param-env stops rustc evaluating + // `::KEY_SIZE` in `as_key`'s array length (E0284), so this impl + // takes the key's own generics and leaves the added predicates behind. + let (key_impl_generics, key_ty_generics, key_where_clause) = input.generics.split_for_impl(); let as_key_impl = if is_generic { quote! {} } else { quote! { - impl #impl_generics #key_ident #ty_generics #where_clause { + impl #key_impl_generics #key_ident #key_ty_generics #key_where_clause { #[must_use] pub fn as_key(&self) -> [u8; ::KEY_SIZE] { let mut buf = [0u8; ::KEY_SIZE]; diff --git a/nix/pkgs/opengrep/binary.sri b/nix/pkgs/opengrep/binary.sri index a823d69b24..6911eff1e5 100644 --- a/nix/pkgs/opengrep/binary.sri +++ b/nix/pkgs/opengrep/binary.sri @@ -1 +1 @@ -sha256-QMISme7dq/dDuFbaqEPST51KAnEwZxzUWzshd2/ZqyY= +sha256-WAU9p2Zyu+tbClRBAhxYM4cHBS4Q+B13cUDKh5vUkc4= diff --git a/npins/sources.json b/npins/sources.json index 369e701a56..bd805184a7 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -11,10 +11,10 @@ "version_upper_bound": null, "release_prefix": null, "submodules": false, - "version": "v0.18.3", - "revision": "f0f46a879943c84b3176e960cef522cf51c9b439", - "url": "https://api.github.com/repos/KaTeX/KaTeX/tarball/refs/tags/v0.18.3", - "hash": "sha256-FZpiUhKFI2GAZmr667gA5yHFezAoRcAADoS0+NrNsJQ=" + "version": "v0.18.4", + "revision": "49dc3d986747fd7d3bb25b597bcb98b071ae6035", + "url": "https://api.github.com/repos/KaTeX/KaTeX/tarball/refs/tags/v0.18.4", + "hash": "sha256-Z458Crgd7o68C1pKE9qf5nJhMAs5D+uyK4nbbtJO/lg=" }, "crane": { "type": "GitRelease", @@ -27,10 +27,10 @@ "version_upper_bound": null, "release_prefix": null, "submodules": false, - "version": "v0.23.4", - "revision": "498d7e7b9b708d584cbc71ec083527f68114f9a3", - "url": "https://api.github.com/repos/ipetkov/crane/tarball/refs/tags/v0.23.4", - "hash": "sha256-nnGD2f8OlAZT2i5OfwikJsw+ifWfiA4d6A8BWlgOXV0=" + "version": "v0.24.0", + "revision": "32daa78aa882b7a43c508d1d5a5ad18a7968d731", + "url": "https://api.github.com/repos/ipetkov/crane/tarball/refs/tags/v0.24.0", + "hash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=" }, "dpdk": { "type": "Git", @@ -97,9 +97,9 @@ }, "branch": "stable/10.6", "submodules": false, - "revision": "4a2c602d195fcfd060318480a8ea39c093054eee", - "url": "https://github.com/FRRouting/frr/archive/4a2c602d195fcfd060318480a8ea39c093054eee.tar.gz", - "hash": "sha256-rGTkZNlvNzFL7RIuguaMz2rfvO4J8N+T9ke5YG9MhdQ=" + "revision": "76a9ef6e68e5f9b36f400d8ec8dfeb05c65e1f09", + "url": "https://github.com/FRRouting/frr/archive/76a9ef6e68e5f9b36f400d8ec8dfeb05c65e1f09.tar.gz", + "hash": "sha256-9VqfbQcrvkgwSkQRk8PAltXbOebypCXCKCx9sKlKXNk=" }, "frr-agent": { "type": "Git", @@ -154,17 +154,17 @@ "version_upper_bound": null, "release_prefix": "mermaid@", "submodules": false, - "version": "mermaid@11.16.1", - "revision": "6b0e5f1c98812b0cb2492d283bb982bc206bd79e", - "url": "https://api.github.com/repos/mermaid-js/mermaid/tarball/refs/tags/mermaid@11.16.1", - "hash": "sha256-gltBmyJTkM3tt3aSx6P3o/It6GbFjqYQ8rM275HDgGU=" + "version": "mermaid@11.17.0", + "revision": "5a88c2d372d3a69611b530a691aa9a8d522c1db3", + "url": "https://api.github.com/repos/mermaid-js/mermaid/tarball/refs/tags/mermaid@11.17.0", + "hash": "sha256-RM1SBYhYzI1oCSKLS//3Fp1F2kF8vETB3SEPxJk8lBw=" }, "nixpkgs": { "type": "Channel", "name": "nixpkgs-unstable", "artifact": "nixexprs.tar.xz", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1048658.70ce23431213/nixexprs.tar.xz", - "hash": "sha256-7UJK0pRtDvDUfAMLP1bQDxXg6iDI30dGQQQCPtQVzgM=" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1059574.a831408e6378/nixexprs.tar.xz", + "hash": "sha256-YfYkbkJcUQ1wzXVX4BcIsLJ+xvB2yHdEbkRl7nPUXA4=" }, "opengrep": { "type": "GitRelease", @@ -177,10 +177,10 @@ "version_upper_bound": null, "release_prefix": null, "submodules": false, - "version": "v1.26.0", - "revision": "1bef4ea4ff3264754132eec823b5b1d8cde3e4ee", - "url": "https://api.github.com/repos/opengrep/opengrep/tarball/refs/tags/v1.26.0", - "hash": "sha256-gu/ob242nq5VFETAFsQ1HcFMlHYBlTKON6rwb7eZmXw=" + "version": "v1.27.1", + "revision": "e7202581ac004654035f5bd08f590ef67bd9c95d", + "url": "https://api.github.com/repos/opengrep/opengrep/tarball/refs/tags/v1.27.1", + "hash": "sha256-Z/VXriXfuL9HIObRL3NvBE/ke36M2tBvlc+9rizLwH4=" }, "perftest": { "type": "Git", @@ -191,9 +191,9 @@ }, "branch": "master", "submodules": false, - "revision": "00b55b6660d0170dabe2c1b49193e8fbe265086e", - "url": "https://github.com/linux-rdma/perftest/archive/00b55b6660d0170dabe2c1b49193e8fbe265086e.tar.gz", - "hash": "sha256-OWqFORfDL9DmFsB3hvbQ3JM4MzcbNr2rooQa7CXz0S4=" + "revision": "b848400df9c1c14b31175da8d6ff5c59b201e9b7", + "url": "https://github.com/linux-rdma/perftest/archive/b848400df9c1c14b31175da8d6ff5c59b201e9b7.tar.gz", + "hash": "sha256-R7yRSfRYYyVNX6v1AcgMdina0SaDVEHBYoJTEXi/ce0=" }, "rdma-core": { "type": "Git", @@ -219,10 +219,10 @@ "version_upper_bound": null, "release_prefix": null, "submodules": false, - "version": "1.97.1", - "revision": "bd3cd8fdf9945e13d317642df03363bfa1b4c30e", - "url": "https://api.github.com/repos/rust-lang/rust/tarball/refs/tags/1.97.1", - "hash": "sha256-wC6YRSVtOxp4qb0Wfl8FyZjkUemDmKETBa004R/f5a0=" + "version": "1.98.0", + "revision": "1429155362e6b0a45ed6269fb3580d320ded0e6d", + "url": "https://api.github.com/repos/rust-lang/rust/tarball/refs/tags/1.98.0", + "hash": "sha256-SrOGuoqS1oSYtbTntsAH9doc/cJ8a+T6u731j17I6H8=" }, "rust-overlay": { "type": "Git", @@ -233,9 +233,9 @@ }, "branch": "master", "submodules": false, - "revision": "6df7076ea0f5697e3242719a4c71211f00411cf5", - "url": "https://github.com/oxalica/rust-overlay/archive/6df7076ea0f5697e3242719a4c71211f00411cf5.tar.gz", - "hash": "sha256-cVTcTqAhzSNMOVddtBhFpuv+Vx6/SgrhgZWJiI61H24=" + "revision": "f60c1b57ff805a46b5175c76fc981fb4f81efbcc", + "url": "https://github.com/oxalica/rust-overlay/archive/f60c1b57ff805a46b5175c76fc981fb4f81efbcc.tar.gz", + "hash": "sha256-r4LDUF+zmJnkftvCVkCrUhSJazsf6EVJF+V2l4/MYbI=" } }, "version": 8 diff --git a/scripts/doc/custom-header.html b/scripts/doc/custom-header.html index 33d87a528e..7ea45d70f6 100644 --- a/scripts/doc/custom-header.html +++ b/scripts/doc/custom-header.html @@ -49,15 +49,15 @@ }; - + - +