Merge pull request #788 from marhkb/build/cargo/update-deps

Build/cargo/update-deps
marhkb · Mar 25, 2024 · ba95092 · ba95092
2 parents f4c4109 + eb3cbd0
commit ba95092
Show file tree

Hide file tree

Showing 8 changed files with 288 additions and 425 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,15 +7,15 @@ edition = "2021"
 [dependencies]
 adw = { version = "0.6", package = "libadwaita", features = ["v1_4"] }
 anyhow = "1"
-ashpd = { version = "0.7", default-features = false, features = ["gtk4", "tokio"] }
+ashpd = { version = "0.8", default-features = false, features = ["gtk4", "tokio"] }
 futures = { version = "0.3", default-features = false }
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
 gtk = { version = "0.8", package = "gtk4", features = ["gnome_45"] }
 indexmap = { version = "2", features = ["serde"] }
 log = "0.4"
 multi_log = "0.1"
 names = { version = "0.14", default-features = false }
-oo7 = { version = "0.2", default-features = false, features = ["native_crypto", "tokio"] }
+oo7 = { version = "0.3", default-features = false, features = ["native_crypto", "tokio"] }
 paste = "1"
 podman-api = { git = "https://github.com/vv9k/podman-api-rs.git", commit = "363d945b9b9905c50dfa0bfe0f9331f9fdeef079", default-features = false }
 serde = "1"

diff --git a/build-aux/com.github.marhkb.Pods.Devel.json b/build-aux/com.github.marhkb.Pods.Devel.json
@@ -1,11 +1,11 @@
 {
     "id": "com.github.marhkb.Pods.Devel",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "45",
+    "runtime-version": "46",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm16"
+        "org.freedesktop.Sdk.Extension.llvm17"
     ],
     "command": "pods",
     "finish-args": [
@@ -19,7 +19,7 @@
         "--filesystem=xdg-run/podman:ro"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm17/bin",
         "env": {
             "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
             "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
@@ -62,7 +62,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/vte.git",
-                    "tag": "0.74.2"
+                    "tag": "0.76.0"
                 }
             ]
         },

diff --git a/src/meson.build b/src/meson.build
@@ -78,7 +78,7 @@ test (
   ],
   env: [
     'CARGO_HOME=@0@'.format(cargo_home),
-    'PATH=/app/bin:/usr/bin:/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin',
+    'PATH=/app/bin:/usr/bin:/usr/lib/sdk/llvm17/bin:/usr/lib/sdk/rust-stable/bin',
   ],
   timeout: 300, # Give cargo more time
 )
diff --git a/src/model/abstract_container_list.rs b/src/model/abstract_container_list.rs
@@ -12,6 +12,7 @@ use crate::model;
 mod imp {
     use super::*;
 
+    #[allow(dead_code)]
     #[derive(Copy, Clone, Debug)]
     pub(crate) struct AbstractContainerList(glib::gobject_ffi::GTypeInterface);
 

diff --git a/src/model/selectable.rs b/src/model/selectable.rs
@@ -7,6 +7,7 @@ use gtk::glib;
 mod imp {
     use super::*;
 
+    #[allow(dead_code)]
     #[derive(Copy, Clone, Debug)]
     pub(crate) struct Selectable(glib::gobject_ffi::GTypeInterface);
 

diff --git a/src/model/selectable_list.rs b/src/model/selectable_list.rs
@@ -12,6 +12,7 @@ use crate::model::prelude::*;
 mod imp {
     use super::*;
 
+    #[allow(dead_code)]
     #[derive(Copy, Clone, Debug)]
     pub(crate) struct SelectableList(glib::gobject_ffi::GTypeInterface);
 

diff --git a/src/view/repo_tag_push_page.rs b/src/view/repo_tag_push_page.rs
@@ -118,7 +118,7 @@ mod imp {
                         utils::do_async(
                             async move {
                                 match keyring
-                                    .search_items(attributes(&host, &namespace))
+                                    .search_items(&attributes(&host, &namespace))
                                     .await
                                     .map_err(anyhow::Error::from)
                                 {
@@ -247,7 +247,7 @@ impl RepoTagPushPage {
                                             keyring
                                                 .create_item(
                                                     &format!("{host}:{namespace}"),
-                                                    attributes(&host, &namespace),
+                                                    &attributes(&host, &namespace),
                                                     serde_json::to_vec(&secret).unwrap(),
                                                     true,
                                                 )
@@ -268,7 +268,10 @@ impl RepoTagPushPage {
                         } else if let Some(keyring) = crate::KEYRING.get() {
                             crate::runtime().spawn({
                                 async move {
-                                    keyring.delete(attributes(&host, &namespace)).await.unwrap();
+                                    keyring
+                                        .delete(&attributes(&host, &namespace))
+                                        .await
+                                        .unwrap();
                                 }
                             });
                         }