diff --git a/Cargo.lock b/Cargo.lock index 60d2a5b..ef6954d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,9 +22,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "cairo-rs" @@ -443,9 +443,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indexmap" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown", @@ -496,9 +496,9 @@ checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "macaddr" @@ -553,9 +553,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -580,9 +580,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -607,15 +607,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "semver" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" @@ -639,9 +639,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -675,9 +675,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.93" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -758,9 +758,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "version-compare" @@ -843,9 +843,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.22" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" +checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310" dependencies = [ "memchr", ] diff --git a/src/app.rs b/src/app.rs index e4bc601..607d364 100644 --- a/src/app.rs +++ b/src/app.rs @@ -396,6 +396,8 @@ mod imp { self.save_automatically(storage.client()); glib::spawn_future_local(storage.spawn()); + // TODO: We need to do this in dbus_register, pending changes to gio + // See https://github.com/gtk-rs/gtk-rs-core/pull/1634 glib::info!("Registering search provider"); self.registered_search_provider .replace(register_app_search_provider(&app)); @@ -467,6 +469,8 @@ mod imp { /// Deregister the search provider interface. fn shutdown(&self) { self.parent_shutdown(); + // TODO: We should to do this in dbus_unregister, pending changes to gio + // See https://github.com/gtk-rs/gtk-rs-core/pull/1634 if let Some(registration_id) = self.registered_search_provider.replace(None) { if let Some(connection) = self.obj().dbus_connection() { if let Err(error) = connection.unregister_object(registration_id) { diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 5a41c95..80c424d 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -86,6 +86,11 @@ who = "Sebastian Wiesner " criteria = "safe-to-run" delta = "1.0.214 -> 1.0.215" +[[audits.serde_json]] +who = "Sebastian Wiesner " +criteria = "safe-to-deploy" +delta = "1.0.137 -> 1.0.138" + [[audits.socket2]] who = "Sebastian Wiesner " criteria = "safe-to-run" @@ -103,6 +108,11 @@ criteria = "safe-to-deploy" delta = "7.0.2 -> 7.0.3" notes = "The diff just updates a dependency version, and does not involve a code change." +[[audits.unicode-ident]] +who = "Sebastian Wiesner " +criteria = "safe-to-deploy" +delta = "1.0.15 -> 1.0.16" + [[trusted.aho-corasick]] criteria = "safe-to-run" user-id = 189 # Andrew Gallant (BurntSushi) diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 69dc7c2..9f8fca1 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -155,8 +155,8 @@ user-login = "Amanieu" user-name = "Amanieu d'Antras" [[publisher.indexmap]] -version = "2.7.0" -when = "2024-12-01" +version = "2.7.1" +when = "2025-01-20" user-id = 539 user-login = "cuviper" user-name = "Josh Stone" @@ -211,8 +211,8 @@ user-login = "sdroege" user-name = "Sebastian Dröge" [[publisher.ryu]] -version = "1.0.18" -when = "2024-05-07" +version = "1.0.19" +when = "2025-01-28" user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" @@ -253,8 +253,8 @@ user-login = "mbrubeck" user-name = "Matt Brubeck" [[publisher.syn]] -version = "2.0.93" -when = "2024-12-28" +version = "2.0.96" +when = "2025-01-10" user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" @@ -344,8 +344,8 @@ user-login = "kennykerr" user-name = "Kenny Kerr" [[publisher.winnow]] -version = "0.6.22" -when = "2025-01-03" +version = "0.6.25" +when = "2025-01-27" user-id = 6743 user-login = "epage" user-name = "Ed Page" @@ -373,6 +373,12 @@ criteria = "safe-to-deploy" delta = "0.8.0 -> 0.9.0" notes = "No major changes in the crate, mostly updates to use new nightly Rust features." +[[audits.bytecode-alliance.audits.pin-project-lite]] +who = "Alex Crichton " +criteria = "safe-to-deploy" +delta = "0.2.13 -> 0.2.14" +notes = "No substantive changes in this update" + [[audits.embark-studios.wildcard-audits.cfg-expr]] who = "Jake Shadle " criteria = "safe-to-deploy" @@ -394,33 +400,16 @@ delta = "0.1.1 -> 0.2.0" aggregated-from = "https://gitlab.gnome.org/GNOME/loupe/-/raw/main/supply-chain/audits.toml" [[audits.google.audits.bitflags]] -who = "Lukasz Anforowicz " -criteria = "safe-to-deploy" -version = "2.4.2" -notes = """ -Audit notes: - -* I've checked for any discussion in Google-internal cl/546819168 (where audit - of version 2.3.3 happened) -* `src/lib.rs` contains `#![cfg_attr(not(test), forbid(unsafe_code))]` -* There are 2 cases of `unsafe` in `src/external.rs` but they seem to be - correct in a straightforward way - they just propagate the marker trait's - impl (e.g. `impl bytemuck::Pod`) from the inner to the outer type -* Additional discussion and/or notes may be found in https://crrev.com/c/5238056 -""" -aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" - -[[audits.google.audits.bitflags]] -who = "Adrian Taylor " -criteria = "safe-to-deploy" -delta = "2.4.2 -> 2.5.0" -aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" +who = "Justin Green " +criteria = "safe-to-run" +version = "2.6.0" +aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT" [[audits.google.audits.bitflags]] -who = "Adrian Taylor " +who = "Lukasz Anforowicz " criteria = "safe-to-deploy" -delta = "2.5.0 -> 2.6.0" -notes = "The changes from the previous version are negligible and thus it retains the same properties." +delta = "2.6.0 -> 2.8.0" +notes = "No changes related to `unsafe impl ... bytemuck` pieces from `src/external.rs`." aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" [[audits.google.audits.crossbeam-utils]] @@ -582,6 +571,13 @@ describe in the review doc. """ aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" +[[audits.google.audits.log]] +who = "Lukasz Anforowicz " +criteria = "safe-to-deploy" +delta = "0.4.22 -> 0.4.25" +notes = "No impact on `unsafe` usage in `lib.rs`." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + [[audits.google.audits.memoffset]] who = "George Burgess IV " criteria = "safe-to-run" @@ -595,11 +591,10 @@ delta = "0.6.5 -> 0.7.1" aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT" [[audits.google.audits.pin-project-lite]] -who = "David Koloski " -criteria = "safe-to-deploy" +who = "ChromeOS" +criteria = "safe-to-run" version = "0.2.9" -notes = "Reviewed on https://fxrev.dev/824504" -aggregated-from = "https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/third_party/rust_crates/supply-chain/audits.toml?format=TEXT" +aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT" [[audits.google.audits.pin-project-lite]] who = "David Koloski " @@ -643,6 +638,25 @@ Some config related changes in wrapper.rs. """ aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" +[[audits.google.audits.proc-macro2]] +who = "Lukasz Anforowicz " +criteria = "safe-to-deploy" +delta = "1.0.89 -> 1.0.92" +notes = """ +I looked at the delta and the previous discussion at +https://chromium-review.googlesource.com/c/chromium/src/+/5385745/3#message-a8e2813129fa3779dab15acede408ee26d67b7f3 +and the changes look okay to me (including the `unsafe fn from_str_unchecked` +changes in `wrapper.rs`). +""" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "Lukasz Anforowicz " +criteria = "safe-to-deploy" +delta = "1.0.92 -> 1.0.93" +notes = "No `unsafe`-related changes." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + [[audits.google.audits.quote]] who = "Lukasz Anforowicz " criteria = "safe-to-deploy" @@ -723,6 +737,13 @@ delta = "1.0.23 -> 1.0.24" notes = "Minor, `ptr_eq`-related changes." aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" +[[audits.google.audits.semver]] +who = "Lukasz Anforowicz " +criteria = "safe-to-run" +delta = "1.0.24 -> 1.0.25" +notes = "No changes in `.rs` files except `doc` attribute changes in `lib.rs`." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + [[audits.google.audits.serde_json]] who = "danakj@chromium.org" criteria = "safe-to-run" @@ -825,6 +846,12 @@ criteria = "safe-to-run" delta = "1.0.133 -> 1.0.134" aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" +[[audits.google.audits.serde_json]] +who = "Lukasz Anforowicz " +criteria = "safe-to-run" +delta = "1.0.134 -> 1.0.137" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + [[audits.google.audits.toml]] who = "George Burgess IV " criteria = "safe-to-run" @@ -866,6 +893,20 @@ delta = "1.0.12 -> 1.0.13" notes = "Lots of table updates, and tables are assumed correct with unsafe `.get_unchecked()`, so ub-risk-2 is appropriate" aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" +[[audits.google.audits.unicode-ident]] +who = "Lukasz Anforowicz " +criteria = "safe-to-deploy" +delta = "1.0.13 -> 1.0.14" +notes = "Minimal delta in `.rs` files: new test assertions + doc changes." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.unicode-ident]] +who = "Adrian Taylor " +criteria = "safe-to-deploy" +delta = "1.0.14 -> 1.0.15" +notes = "No changes relevant to any of these criteria." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + [[audits.mozilla.audits.crossbeam-utils]] who = "Jan-Erik Rediger " criteria = "safe-to-deploy" @@ -879,26 +920,14 @@ delta = "0.8.19 -> 0.8.20" notes = "Minor changes." aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.pin-project-lite]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.2.13 -> 0.2.14" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.swsnr.audits.cfg-expr]] who = "Sebastian Wiesner " criteria = "safe-to-run" delta = "0.17.0 -> 0.17.2" aggregated-from = "https://raw.githubusercontent.com/swsnr/gnome-search-providers-vscode/refs/heads/main/supply-chain/audits.toml" -[[audits.swsnr.audits.proc-macro2]] +[[audits.swsnr.audits.pin-project-lite]] who = "Sebastian Wiesner " criteria = "safe-to-run" -delta = "1.0.89 -> 1.0.92" -aggregated-from = "https://raw.githubusercontent.com/swsnr/gnome-search-providers-vscode/refs/heads/main/supply-chain/audits.toml" - -[[audits.swsnr.audits.unicode-ident]] -who = "Sebastian Wiesner " -criteria = "safe-to-run" -delta = "1.0.13 -> 1.0.14" +delta = "0.2.15 -> 0.2.16" aggregated-from = "https://raw.githubusercontent.com/swsnr/gnome-search-providers-vscode/refs/heads/main/supply-chain/audits.toml"