From 472a0b3ab253c80c06fcb697c3ea464386277d7a Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Wed, 1 Apr 2026 14:47:46 +0100 Subject: [PATCH 1/2] rustfmt: Enable an extra feature Reduce useless '_' in the code --- .rustfmt.toml | 1 + client/src/keyring.rs | 2 +- server/src/service/tests.rs | 15 ++++++--------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index 5f2b10f92..77e99a22e 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -5,3 +5,4 @@ newline_style = "Unix" normalize_comments = true normalize_doc_attributes = true wrap_comments = true +condense_wildcard_suffixes = true diff --git a/client/src/keyring.rs b/client/src/keyring.rs index 5b7f2f2e3..836c77735 100644 --- a/client/src/keyring.rs +++ b/client/src/keyring.rs @@ -400,7 +400,7 @@ impl Item { T: for<'a> std::convert::TryFrom<&'a HashMap, Error = crate::SchemaError>, { match self { - Self::File(_, _) => T::try_from(&self.attributes().await?) + Self::File(..) => T::try_from(&self.attributes().await?) .map_err(crate::file::Error::Schema) .map_err(Into::into), Self::DBus(_) => T::try_from(&self.attributes().await?) diff --git a/server/src/service/tests.rs b/server/src/service/tests.rs index 038fbfc70..5559d6e43 100644 --- a/server/src/service/tests.rs +++ b/server/src/service/tests.rs @@ -1159,7 +1159,7 @@ async fn discover_v1_keyrings() -> Result<(), Box> { let work_keyring = discovered .iter() - .find(|(_, label, _, _)| label == "Work") + .find(|(_, label, ..)| label == "Work") .unwrap(); assert!( !work_keyring.3.is_locked(), @@ -1168,7 +1168,7 @@ async fn discover_v1_keyrings() -> Result<(), Box> { let personal_keyring = discovered .iter() - .find(|(_, label, _, _)| label == "Personal") + .find(|(_, label, ..)| label == "Personal") .unwrap(); assert!( personal_keyring.3.is_locked(), @@ -1178,7 +1178,7 @@ async fn discover_v1_keyrings() -> Result<(), Box> { // Test 4: Verify login keyring gets default alias let login_keyring = discovered .iter() - .find(|(_, label, _, _)| label == "Login") + .find(|(_, label, ..)| label == "Login") .unwrap(); assert_eq!( login_keyring.2, @@ -1193,7 +1193,7 @@ async fn discover_v1_keyrings() -> Result<(), Box> { // Test 5: Verify labels are properly capitalized let labels: Vec<_> = discovered .iter() - .map(|(_, label, _, _)| label.as_str()) + .map(|(_, label, ..)| label.as_str()) .collect(); assert!(labels.contains(&"Work"), "Should have Work with capital W"); assert!( @@ -1355,10 +1355,7 @@ async fn discover_v0_keyrings() -> Result<(), Box> { let discovered = service.discover_keyrings(Some(v0_secret.clone())).await?; assert_eq!(discovered.len(), 2, "Should discover both keyrings"); - let legacy = discovered - .iter() - .find(|(_, l, _, _)| l == "Legacy") - .unwrap(); + let legacy = discovered.iter().find(|(_, l, ..)| l == "Legacy").unwrap(); assert!(!legacy.3.is_locked(), "V0 should be migrated and unlocked"); assert_eq!( service.pending_migrations.lock().await.len(), @@ -1453,7 +1450,7 @@ async fn discover_kwallet_keyrings() -> Result<(), Box> { let kdewallet = discovered .iter() - .find(|(_, l, _, _)| l == "Kdewallet") + .find(|(_, l, ..)| l == "Kdewallet") .unwrap(); assert!( !kdewallet.3.is_locked(), From ae0a510c1daaae8dc7cceda74252896b5deed003 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Wed, 1 Apr 2026 15:57:08 +0100 Subject: [PATCH 2/2] server: Rename lib crate Avoids having a completely separate crate name. --- client/src/migration.rs | 2 +- client/tests/dbus_collection.rs | 26 +++++++++++++------------- client/tests/dbus_item.rs | 24 ++++++++++++------------ client/tests/dbus_service.rs | 14 +++++++------- client/tests/keyring.rs | 4 ++-- server/Cargo.toml | 2 +- server/src/lib.rs | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/client/src/migration.rs b/client/src/migration.rs index 30e2add50..6f6c93a27 100644 --- a/client/src/migration.rs +++ b/client/src/migration.rs @@ -82,7 +82,7 @@ mod tests { #[cfg(feature = "tokio")] async fn test_migrate_from_dbus_to_file() { let temp_dir = tempfile::tempdir().unwrap(); - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); diff --git a/client/tests/dbus_collection.rs b/client/tests/dbus_collection.rs index f9f330215..47fe60fc7 100644 --- a/client/tests/dbus_collection.rs +++ b/client/tests/dbus_collection.rs @@ -39,7 +39,7 @@ async fn create_item(service: Service, encrypted: bool) { #[tokio::test] #[cfg(feature = "tokio")] async fn create_plain_item() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -51,7 +51,7 @@ async fn create_plain_item() { #[tokio::test] #[cfg(feature = "tokio")] async fn create_encrypted_item() { - let setup = oo7_server::tests::TestServiceSetup::encrypted_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::encrypted_session(true) .await .unwrap(); let service = Service::encrypted_with_connection(&setup.client_conn) @@ -63,7 +63,7 @@ async fn create_encrypted_item() { #[tokio::test] #[cfg(feature = "tokio")] async fn attribute_search_patterns() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -144,7 +144,7 @@ async fn attribute_search_patterns() { #[tokio::test] #[cfg(feature = "tokio")] async fn items() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -193,7 +193,7 @@ async fn items() { #[tokio::test] #[cfg(feature = "tokio")] async fn label_mutation() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -215,7 +215,7 @@ async fn label_mutation() { #[tokio::test] #[cfg(feature = "tokio")] async fn collections_list() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -252,7 +252,7 @@ async fn collections_list() { #[tokio::test] #[cfg(feature = "tokio")] async fn with_alias() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -287,7 +287,7 @@ async fn with_alias() { #[tokio::test] #[cfg(feature = "tokio")] async fn timestamps() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -321,7 +321,7 @@ async fn timestamps() { #[tokio::test] #[cfg(feature = "tokio")] async fn deleted_error() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -391,7 +391,7 @@ async fn deleted_error() { #[tokio::test] #[cfg(feature = "tokio")] async fn lock_unlock() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(false) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(false) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -420,7 +420,7 @@ async fn lock_unlock() { #[tokio::test] #[cfg(feature = "tokio")] async fn item_created_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -467,7 +467,7 @@ async fn item_created_signal() { #[tokio::test] #[cfg(feature = "tokio")] async fn item_changed_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -515,7 +515,7 @@ async fn item_changed_signal() { #[tokio::test] #[cfg(feature = "tokio")] async fn item_deleted_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) diff --git a/client/tests/dbus_item.rs b/client/tests/dbus_item.rs index 8f5265174..b3d6eee38 100644 --- a/client/tests/dbus_item.rs +++ b/client/tests/dbus_item.rs @@ -4,7 +4,7 @@ use oo7::dbus::Service; #[tokio::test] #[cfg(feature = "tokio")] async fn label_mutation() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -39,7 +39,7 @@ async fn label_mutation() { #[tokio::test] #[cfg(feature = "tokio")] async fn secret_mutation() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -73,7 +73,7 @@ async fn secret_mutation() { #[tokio::test] #[cfg(feature = "tokio")] async fn secret_mutation_encrypted() { - let setup = oo7_server::tests::TestServiceSetup::encrypted_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::encrypted_session(true) .await .unwrap(); let service = Service::encrypted_with_connection(&setup.client_conn) @@ -107,7 +107,7 @@ async fn secret_mutation_encrypted() { #[tokio::test] #[cfg(feature = "tokio")] async fn attributes_mutation() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -155,7 +155,7 @@ async fn attributes_mutation() { #[tokio::test] #[cfg(feature = "tokio")] async fn text_secret_type() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -182,7 +182,7 @@ async fn text_secret_type() { #[tokio::test] #[cfg(feature = "tokio")] async fn blob_secret_type() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -213,7 +213,7 @@ async fn blob_secret_type() { #[tokio::test] #[cfg(feature = "tokio")] async fn timestamps() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -256,7 +256,7 @@ async fn timestamps() { #[tokio::test] #[cfg(feature = "tokio")] async fn deleted_error() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -329,7 +329,7 @@ async fn deleted_error() { #[tokio::test] #[cfg(feature = "tokio")] async fn lock_unlock() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -360,7 +360,7 @@ async fn lock_unlock() { #[tokio::test] #[cfg(feature = "tokio")] async fn item_created_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -407,7 +407,7 @@ async fn item_created_signal() { #[tokio::test] #[cfg(feature = "tokio")] async fn item_changed_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -455,7 +455,7 @@ async fn item_changed_signal() { #[tokio::test] #[cfg(feature = "tokio")] async fn item_deleted_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) diff --git a/client/tests/dbus_service.rs b/client/tests/dbus_service.rs index c7a195ea8..604ab5c65 100644 --- a/client/tests/dbus_service.rs +++ b/client/tests/dbus_service.rs @@ -4,7 +4,7 @@ use oo7::dbus::Service; #[tokio::test] #[cfg(feature = "tokio")] async fn create_collection() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -32,7 +32,7 @@ async fn create_collection() { #[tokio::test] #[cfg(feature = "tokio")] async fn default_collections() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -46,7 +46,7 @@ async fn default_collections() { #[tokio::test] #[cfg(feature = "tokio")] async fn encrypted_session() { - let setup = oo7_server::tests::TestServiceSetup::encrypted_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::encrypted_session(true) .await .unwrap(); let service = Service::encrypted_with_connection(&setup.client_conn) @@ -58,7 +58,7 @@ async fn encrypted_session() { #[tokio::test] #[cfg(feature = "tokio")] async fn plain_session() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -70,7 +70,7 @@ async fn plain_session() { #[tokio::test] #[cfg(feature = "tokio")] async fn collection_created_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -107,7 +107,7 @@ async fn collection_created_signal() { #[tokio::test] #[cfg(feature = "tokio")] async fn collection_changed_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) @@ -148,7 +148,7 @@ async fn collection_changed_signal() { #[tokio::test] #[cfg(feature = "tokio")] async fn collection_deleted_signal() { - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); let service = Service::plain_with_connection(&setup.client_conn) diff --git a/client/tests/keyring.rs b/client/tests/keyring.rs index 4ee5e9288..9482c3541 100644 --- a/client/tests/keyring.rs +++ b/client/tests/keyring.rs @@ -5,7 +5,7 @@ use tempfile::tempdir; async fn all_backends( temp_dir: &tempfile::TempDir, -) -> (oo7_server::tests::TestServiceSetup, Vec) { +) -> (oo7_daemon::tests::TestServiceSetup, Vec) { let mut backends = Vec::new(); let keyring_path = temp_dir.path().join("test.keyring"); @@ -15,7 +15,7 @@ async fn all_backends( .unwrap(); backends.push(unlocked); - let setup = oo7_server::tests::TestServiceSetup::plain_session(true) + let setup = oo7_daemon::tests::TestServiceSetup::plain_session(true) .await .unwrap(); diff --git a/server/Cargo.toml b/server/Cargo.toml index 3edaf9a79..ee64efcb2 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -15,7 +15,7 @@ name = "oo7-daemon" path = "src/main.rs" [lib] -name = "oo7_server" +name = "oo7_daemon" path = "src/lib.rs" test = false diff --git a/server/src/lib.rs b/server/src/lib.rs index 768c5cfb9..fd508e545 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -1,4 +1,4 @@ -// Library interface for oo7_server +// Library interface for oo7_daemon // Only expose test utilities when the test-util feature is enabled #![allow(unused)] #![deny(unsafe_code)]