Merge pull request #342 from cortex/clippy-and-dependencies

fix a number of clippy lints

Cargo.toml

@@ -9,21 +9,21 @@ license = "GPL-3.0-only"
 edition = '2021'
 
 [dependencies]
-arboard = "3.3.0"
+arboard = "3.3.2"
 glob = "0.3.1"
 gpgme = "0.11.0"
 chrono = { version = "0.4", default_features = false, features = ["clock"] }
-git2 = "0.18.1"
+git2 = "0.18.2"
 rand = "0.8.5"
 whoami = "1.4.1"
-toml = "0.8.8"
-reqwest = { version = "0.11.23", features = ["blocking"] }
+toml = "0.8.10"
+reqwest = { version = "0.11.25", features = ["blocking"] }
 hex = "0.4.3"
-totp-rs = { version = "5.3.0", features = ["otpauth"] }
-sequoia-openpgp = "1.18.0"
-anyhow = "1.0.79"
-sequoia-ipc = "0.32.0"
-base64 = "0.21.7"
+totp-rs = { version = "5.5.1", features = ["otpauth"] }
+sequoia-openpgp = "1.19.0"
+anyhow = "1.0.80"
+sequoia-ipc = "0.34.1"
+base64 = "0.22.0"
 sha2 = "0.10.8"
 sha1 = "0.10.6"
 hmac = "0.12.1"
@@ -35,7 +35,7 @@ default-features = false
 features = ["toml"]
 
 [dev-dependencies]
-tempfile = "3.9.0"
+tempfile = "3.10.1"
 flate2 = "1.0.28"
 tar = "0.4.40"
 criterion = "0.5.1"

cursive/Cargo.toml

@@ -18,7 +18,7 @@ locale_config = "0.3.0"
 unic-langid = "0.9.4"
 gettext = "0.4.0"
 lazy_static = "1.4.0"
-toml = "0.8.8"
+toml = "0.8.10"
 terminal_size = "0.3.0"
 hex = "0.4.3"
 zeroize = { version = "1.7.0", features = ["zeroize_derive", "alloc"] }
@@ -29,7 +29,7 @@ default-features = false
 features = ["toml"]
 
 [dev-dependencies]
-tempfile = "3.8.0"
+tempfile = "3.10.1"
 chrono = { version = "0.4", default_features = false, features = ["clock"] }
 
 [build-dependencies]

gtk/Cargo.toml

@@ -7,13 +7,13 @@ edition = "2021"
 
 [dependencies]
 ripasso = { path = "../", version = "0.7.0-alpha" }
-gtk = { version = "0.6.6", package = "gtk4", features = ["v4_6"] }
-adw = { version = "0.4.1", package = "libadwaita" }
-glib = "0.17.9"
-once_cell = "1.17.1"
+gtk = { version = "0.8.1", package = "gtk4", features = ["v4_6"] }
+adw = { version = "0.6.0", package = "libadwaita" }
+glib = "0.19.2"
+once_cell = "1.19.0"
 hex = "0.4.3"
 config = "0.11.0"
 chrono = { version = "0.4", default_features = false, features = ["clock"] }
 
 [build-dependencies]
-glib-build-tools = "0.17"
+glib-build-tools = "0.19"

gtk/src/collection_object/mod.rs

@@ -111,7 +111,7 @@ impl CollectionObject {
             .map(|p| PasswordObject::from_password_entry(p, store.clone()))
             .collect();
 
-        let passwords = gio::ListStore::new(PasswordObject::static_type());
+        let passwords = gio::ListStore::new::<PasswordObject>();
         passwords.extend_from_slice(&passwords_to_extend);
 
         Self::new(&title, passwords, store, user_config_dir)

gtk/src/window/imp.rs

@@ -1,7 +1,7 @@
 use std::{cell::RefCell, path::PathBuf};
 
 use adw::{subclass::prelude::*, Leaflet};
-use glib::{signal::Inhibit, subclass::InitializingObject};
+use glib::{subclass::InitializingObject, Propagation};
 use gtk::{
     gio, glib, glib::SignalHandlerId, Button, CompositeTemplate, Entry, FilterListModel, ListBox,
     Stack,
@@ -87,7 +87,7 @@ impl WidgetImpl for Window {}
 
 // Trait shared by all windows
 impl WindowImpl for Window {
-    fn close_request(&self) -> Inhibit {
+    fn close_request(&self) -> Propagation {
         // Pass close request on to the parent
         self.parent_close_request()
     }

gtk/src/window/mod.rs

@@ -73,7 +73,7 @@ impl Window {
     }
 
     fn setup_collections(&self) {
-        let collections = gio::ListStore::new(CollectionObject::static_type());
+        let collections = gio::ListStore::new::<CollectionObject>();
         self.imp()
             .collections
             .set(collections.clone())
@@ -421,7 +421,7 @@ impl Window {
                 }
 
                 // Create a new list store
-                let passwords = gio::ListStore::new(PasswordObject::static_type());
+                let passwords = gio::ListStore::new::<PasswordObject>();
 
                 // Create a new collection object from the title the user provided
                 let title = entry.text().to_string();

src/tests/crypto.rs

@@ -67,7 +67,7 @@ pub fn new_one_cert() {
 
     cert.serialize(&mut file).unwrap();
 
-    let sequoia = Sequoia::new(&dir.path(), f, user_home.path()).unwrap();
+    let sequoia = Sequoia::new(dir.path(), f, user_home.path()).unwrap();
 
     assert_eq!(1, sequoia.key_ring.len());
     assert_eq!(
@@ -80,7 +80,7 @@ pub fn new_one_cert() {
             .next()
             .unwrap()
             .userid()
-            .email()
+            .email2()
             .unwrap()
             .unwrap()
     );

src/tests/git.rs

@@ -22,7 +22,7 @@ fn test_should_sign_true() -> Result<()> {
 
     let result = should_sign(&repo);
 
-    assert_eq!(true, result);
+    assert!(result);
 
     Ok(())
 }
@@ -35,7 +35,7 @@ fn test_should_sign_false() -> Result<()> {
 
     let result = should_sign(&repo);
 
-    assert_eq!(false, result);
+    assert!(!result);
 
     Ok(())
 }