From 5540de7aa68c1bfaa947f249ea3ff657d252b774 Mon Sep 17 00:00:00 2001 From: coblit Date: Sun, 7 Jul 2024 09:29:08 +0000 Subject: [PATCH 1/5] Updated rfd version to 0.14.1. --- Cargo.lock | 285 +++++++++++++++++++++++++++++++++++++++++------------ Cargo.toml | 2 +- 2 files changed, 225 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd1d80dfdd70..1c0907e5e1ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,13 +57,13 @@ checksum = "6c8c9b4467d77cacfbc93cee9aa8e7822f6d527c774efdca5f8b3a5280c34847" dependencies = [ "accesskit", "accesskit_consumer", - "async-channel", + "async-channel 1.9.0", "async-once-cell", "atspi", "futures-lite 1.13.0", "once_cell", "serde", - "zbus", + "zbus 3.15.1", ] [[package]] @@ -334,21 +334,20 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.6.8" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac22eda5891cc086690cb6fa10121c0390de0e3b04eb269f2d766b00d3f2d81" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ "async-fs 2.1.0", "async-net", "enumflags2", "futures-channel", "futures-util", - "once_cell", "rand", "serde", "serde_repr", "url", - "zbus", + "zbus 4.0.1", ] [[package]] @@ -361,6 +360,18 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.2.0", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -372,6 +383,19 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-channel" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" +dependencies = [ + "concurrent-queue", + "event-listener 5.2.0", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-executor" version = "1.5.1" @@ -431,9 +455,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ "async-lock 3.1.0", "cfg-if", @@ -445,8 +469,7 @@ dependencies = [ "rustix 0.38.24", "slab", "tracing", - "waker-fn", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -465,7 +488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" dependencies = [ "event-listener 3.1.0", - "event-listener-strategy", + "event-listener-strategy 0.3.0", "pin-project-lite", ] @@ -475,7 +498,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.2.0", + "async-io 2.3.3", "blocking", "futures-lite 2.1.0", ] @@ -503,6 +526,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "async-process" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +dependencies = [ + "async-channel 2.3.0", + "async-io 2.3.3", + "async-lock 3.1.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 5.2.0", + "futures-lite 2.1.0", + "rustix 0.38.24", + "windows-sys 0.52.0", +] + [[package]] name = "async-recursion" version = "1.0.4" @@ -520,7 +561,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.0", + "async-io 2.3.3", "async-lock 2.7.0", "atomic-waker", "cfg-if", @@ -575,9 +616,9 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "zbus", - "zbus_names", - "zvariant", + "zbus 3.15.1", + "zbus_names 2.6.0", + "zvariant 3.15.1", ] [[package]] @@ -589,7 +630,7 @@ dependencies = [ "atspi-common", "atspi-proxies", "futures-lite 1.13.0", - "zbus", + "zbus 3.15.1", ] [[package]] @@ -600,7 +641,7 @@ checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" dependencies = [ "atspi-common", "serde", - "zbus", + "zbus 3.15.1", ] [[package]] @@ -749,7 +790,7 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-lock 2.7.0", "async-task", "atomic-waker", @@ -1585,7 +1626,7 @@ dependencies = [ "percent-encoding", "pollster", "puffin", - "raw-window-handle 0.6.0", + "raw-window-handle", "ron", "serde", "static_assertions", @@ -1648,7 +1689,7 @@ dependencies = [ "egui", "log", "puffin", - "raw-window-handle 0.6.0", + "raw-window-handle", "serde", "smithay-clipboard", "web-time", @@ -1777,6 +1818,12 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enum-map" version = "2.6.3" @@ -1947,6 +1994,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "event-listener-strategy" version = "0.3.0" @@ -1957,6 +2015,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + [[package]] name = "ewebsock" version = "0.6.0" @@ -3200,7 +3268,7 @@ dependencies = [ "log", "ndk-sys", "num_enum", - "raw-window-handle 0.6.0", + "raw-window-handle", "thiserror", ] @@ -3238,6 +3306,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", + "memoffset 0.9.0", +] + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -4141,12 +4221,6 @@ dependencies = [ "rand", ] -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - [[package]] name = "raw-window-handle" version = "0.6.0" @@ -5577,22 +5651,20 @@ dependencies = [ [[package]] name = "rfd" -version = "0.12.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241a0deb168c88050d872294f7b3106c1dfa8740942bcc97bc91b98e97b5c501" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" dependencies = [ "ashpd", - "async-io 1.13.0", "block", "dispatch", - "futures-util", "js-sys", "log", "objc", "objc-foundation", "objc_id", "pollster", - "raw-window-handle 0.5.2", + "raw-window-handle", "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", @@ -6747,10 +6819,11 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] @@ -7119,7 +7192,7 @@ checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" dependencies = [ "cc", "downcast-rs", - "nix", + "nix 0.26.2", "scoped-tls", "smallvec", "wayland-sys", @@ -7132,7 +7205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ "bitflags 2.5.0", - "nix", + "nix 0.26.2", "wayland-backend", "wayland-scanner", ] @@ -7154,7 +7227,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" dependencies = [ - "nix", + "nix 0.26.2", "wayland-client", "xcursor", ] @@ -7295,7 +7368,7 @@ dependencies = [ "naga", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -7324,7 +7397,7 @@ dependencies = [ "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", @@ -7364,7 +7437,7 @@ dependencies = [ "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -7700,7 +7773,7 @@ dependencies = [ "once_cell", "orbclient", "percent-encoding", - "raw-window-handle 0.6.0", + "raw-window-handle", "redox_syscall 0.3.5", "rustix 0.38.24", "smithay-client-toolkit", @@ -7782,7 +7855,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ - "nix", + "nix 0.26.2", "winapi", ] @@ -7828,16 +7901,16 @@ checksum = "1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c" [[package]] name = "zbus" -version = "3.14.1" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d" dependencies = [ - "async-broadcast", + "async-broadcast 0.5.1", "async-executor", "async-fs 1.6.0", "async-io 1.13.0", "async-lock 2.7.0", - "async-process", + "async-process 1.8.1", "async-recursion", "async-task", "async-trait", @@ -7850,7 +7923,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix", + "nix 0.26.2", "once_cell", "ordered-stream", "rand", @@ -7862,16 +7935,69 @@ dependencies = [ "uds_windows", "winapi", "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", + "zbus_macros 3.15.1", + "zbus_names 2.6.0", + "zvariant 3.15.1", +] + +[[package]] +name = "zbus" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs 2.1.0", + "async-io 2.3.3", + "async-lock 3.1.0", + "async-process 2.1.0", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "derivative", + "enumflags2", + "event-listener 5.2.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.27.1", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.0.1", + "zbus_names 3.0.0", + "zvariant 4.0.0", ] [[package]] name = "zbus_macros" -version = "3.14.1" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_macros" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7889,7 +8015,18 @@ checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" dependencies = [ "serde", "static_assertions", - "zvariant", + "zvariant 3.15.1", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.0.0", ] [[package]] @@ -7941,24 +8078,50 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67" dependencies = [ "byteorder", "enumflags2", "libc", "serde", "static_assertions", + "zvariant_derive 3.15.1", +] + +[[package]] +name = "zvariant" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", "url", - "zvariant_derive", + "zvariant_derive 4.0.0", ] [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_derive" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7969,9 +8132,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index a90c0dbaa949..59bb97a97852 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -200,7 +200,7 @@ quote = "1.0" rand = { version = "0.8", default-features = false } rand_distr = { version = "0.4", default-features = false } rayon = "1.7" -rfd = { version = "0.12", default-features = false, features = ["xdg-portal"] } +rfd = { version = "0.14.1", default-features = false, features = ["async-std", "xdg-portal"] } rmp-serde = "1" ron = "0.8.0" rust-format = "0.3" From d8334c8a287221f398aab0b82599095f30931e03 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Tue, 29 Oct 2024 11:13:17 +0100 Subject: [PATCH 2/5] Update futures family of crates - our version of futures-util was yanked --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e04937bdaeff..d780bd648018 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2628,9 +2628,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2638,9 +2638,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" @@ -2655,9 +2655,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2689,9 +2689,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -2700,21 +2700,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", From 437df543a2f8ea74b81bccd2874c3bc4a5d57327 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Tue, 29 Oct 2024 11:18:42 +0100 Subject: [PATCH 3/5] formatting --- Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 9f4b7a3ff2e8..aea9d0f30a85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -236,7 +236,10 @@ quote = "1.0" rand = { version = "0.8", default-features = false } rand_distr = { version = "0.4", default-features = false } rayon = "1.7" -rfd = { version = "0.14.1", default-features = false, features = ["async-std", "xdg-portal"] } +rfd = { version = "0.14.1", default-features = false, features = [ + "async-std", + "xdg-portal", +] } rmp-serde = "1" ron = "0.8.0" rust-format = "0.3" From 81e043da26246bae17dde50cf809fcc80c182aab Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Tue, 29 Oct 2024 15:44:53 +0100 Subject: [PATCH 4/5] update to rfd 0.15.0, update deny exceptions --- Cargo.lock | 41 ++++++++++++----------------------------- Cargo.toml | 2 +- deny.toml | 6 +++--- 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cb14bbde197c..81c7ca37421e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -536,9 +536,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ "async-fs 2.1.0", "async-net", @@ -546,9 +546,13 @@ dependencies = [ "futures-channel", "futures-util", "rand", + "raw-window-handle", "serde", "serde_repr", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols", "zbus 4.0.1", ] @@ -4402,17 +4406,6 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - [[package]] name = "objc-sys" version = "0.3.5" @@ -4616,15 +4609,6 @@ dependencies = [ "objc2-foundation", ] -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - [[package]] name = "object" version = "0.32.2" @@ -7050,18 +7034,17 @@ dependencies = [ [[package]] name = "rfd" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e" dependencies = [ "ashpd", - "block", - "dispatch", + "block2", "js-sys", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "pollster", "raw-window-handle", "urlencoding", diff --git a/Cargo.toml b/Cargo.toml index aea9d0f30a85..5f5eaf0e8b6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -236,7 +236,7 @@ quote = "1.0" rand = { version = "0.8", default-features = false } rand_distr = { version = "0.4", default-features = false } rayon = "1.7" -rfd = { version = "0.14.1", default-features = false, features = [ +rfd = { version = "0.15.0", default-features = false, features = [ "async-std", "xdg-portal", ] } diff --git a/deny.toml b/deny.toml index f84c0e3f1978..25ac75019ffc 100644 --- a/deny.toml +++ b/deny.toml @@ -62,16 +62,16 @@ skip = [ { name = "spin" }, # Old version used by rusttls ] skip-tree = [ - { name = "async-io" }, # Old version via rfd + { name = "async-io" }, # Old version via old zbus. { name = "cargo-run-wasm" }, # Dev-tool { name = "criterion" }, # dev-dependency - { name = "objc2" }, # old version via accesskit { name = "prost-build" }, # only used in objectron example { name = "prost-derive" }, # only used in objectron example { name = "toml_edit" }, # Old version via egui-winit, newer used by rustdoc-json - { name = "windows" }, # Old version used by accesskit_windows, newer version used by wgpu { name = "tower" }, # tonic depends on 0.4.3, but also transitively (axum) on 0.5.1 { name = "walkers" }, # TODO(#7876): suppress that when `walkers` is updated + { name = "windows" }, # Old version used by accesskit_windows, newer version used by wgpu + { name = "zbus" }, # Very tangled, part of the ecosystem uses zbus 3.x.x, part uses 4.x.x ] From 320481248741299c829f36360636044a80675850 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Tue, 29 Oct 2024 15:53:13 +0100 Subject: [PATCH 5/5] general update of cargo deny exceptions --- deny.toml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/deny.toml b/deny.toml index 25ac75019ffc..752e6206bcf6 100644 --- a/deny.toml +++ b/deny.toml @@ -46,20 +46,16 @@ deny = [ # { name = "reqwest" }, # We prefer ureq - less dependencies TODO(#7876): reenable that when `walkers` is updated ] skip = [ - { name = "ahash" }, # Popular crate + fast release schedule = lots of crates still using old versions - { name = "async-channel" }, # Old version via accesskit - { name = "async-fs" }, # Old version via accesskit - { name = "base64" }, # Too popular - { name = "cargo_metadata" }, # Older version used by ply-rs. It's small, and it's build-time only! - { name = "cfg_aliases" }, # Tiny macro-only crate. wgpu/naga is using an old version - { name = "hashbrown" }, # Old version used by polar-rs - { name = "libloading" }, # Old version used by ash (vulkan binding), newer version used by khronos-egl - { name = "memoffset" }, # Small crate - { name = "prettyplease" }, # Old version being used by prost - { name = "pulldown-cmark" }, # Build-dependency via `ply-rs` (!). TODO(emilk): use a better crate for .ply parsing - { name = "raw-window-handle" }, # Pretty small crate; some crates still on old version - { name = "redox_syscall" }, # Plenty of versions in the wild - { name = "spin" }, # Old version used by rusttls + { name = "ahash" }, # Popular crate + fast release schedule = lots of crates still using old versions + { name = "async-channel" }, # Old version via zbus 3.x.x + { name = "async-fs" }, # Old version via zbus 3.x.x + { name = "base64" }, # Too popular + { name = "cargo_metadata" }, # Older version used by ply-rs. It's small, and it's build-time only! + { name = "cfg_aliases" }, # Tiny macro-only crate. wgpu/naga is using an old version + { name = "hashbrown" }, # Old version used by polar-rs + { name = "memoffset" }, # Small crate + { name = "pulldown-cmark" }, # Build-dependency via `ply-rs` (!). TODO(emilk): use a better crate for .ply parsing + { name = "redox_syscall" }, # Plenty of versions in the wild ] skip-tree = [ { name = "async-io" }, # Old version via old zbus. @@ -70,7 +66,7 @@ skip-tree = [ { name = "toml_edit" }, # Old version via egui-winit, newer used by rustdoc-json { name = "tower" }, # tonic depends on 0.4.3, but also transitively (axum) on 0.5.1 { name = "walkers" }, # TODO(#7876): suppress that when `walkers` is updated - { name = "windows" }, # Old version used by accesskit_windows, newer version used by wgpu + { name = "windows" }, # Old version used by sysinfo, newer version used by access kit and even newer version by reflink-copy (which through some indireection comes in via walkers). { name = "zbus" }, # Very tangled, part of the ecosystem uses zbus 3.x.x, part uses 4.x.x ]