server: Remove all Debug impl except necessary

Reduces a little bit binary size and they are not useful anyways given
that it is a binary size and the user can't debug the types if something
fails.

Author: bilelmoussaoui

server/src/capability.rs

@@ -58,7 +58,7 @@ fn set_bounding_set(caps: CapabilitySet) -> Result<(), rustix::io::Errno> {
     Ok(())
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(PartialEq)]
 enum CapabilityState {
     Full,    // setuid root or root user
     Partial, // filesystem-based capabilities

server/src/collection/mod.rs

@@ -24,7 +24,7 @@ use crate::{
     item,
 };
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Collection {
     // Properties
     items: Arc<Mutex<Vec<item::Item>>>,

server/src/gnome/internal.rs

@@ -20,7 +20,7 @@ use crate::{
 pub const INTERNAL_INTERFACE_PATH: &str =
     "/org/gnome/keyring/InternalUnsupportedGuiltRiddenInterface";
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct InternalInterface {
     service: Service,
 }

server/src/gnome/prompter.rs

@@ -43,7 +43,7 @@ mod double_value_optional {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Type, Default)]
+#[derive(Serialize, Deserialize, Type, Default)]
 #[zvariant(signature = "dict")]
 #[serde(rename_all = "kebab-case")]
 // GcrPrompt properties <https://gitlab.gnome.org/GNOME/gcr/-/blob/main/gcr/gcr-prompt.c#L95>
@@ -226,7 +226,7 @@ impl TryFrom<String> for Reply {
     }
 }
 
-#[derive(Deserialize, Serialize, Debug, Type, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deserialize, Serialize, Type, PartialEq, Eq, PartialOrd, Ord)]
 #[serde(rename_all = "lowercase")]
 #[zvariant(signature = "s")]
 pub enum PromptType {
@@ -254,7 +254,7 @@ pub trait GNOMEPrompter {
     fn stop_prompting(&self, callback: &ObjectPath<'_>) -> Result<(), ServiceError>;
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct GNOMEPrompterCallback {
     window_id: Option<WindowIdentifierType>,
     private_key: Arc<Key>,

server/src/item/mod.rs

@@ -8,7 +8,7 @@ use zbus::zvariant::{ObjectPath, OwnedObjectPath};
 
 use crate::{Service, collection::Collection, error::custom_service_error};
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Item {
     // Properties
     pub(super) inner: Arc<Mutex<Option<oo7::file::Item>>>,

server/src/migration.rs

@@ -7,7 +7,7 @@ use oo7::{Secret, file::UnlockedKeyring};
 use crate::error::Error;
 
 /// Pending keyring migration
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub enum PendingMigration {
     /// Legacy v0 keyring format
     V0 {

server/src/pam_listener/mod.rs

@@ -25,7 +25,7 @@ enum PamOperation {
     ChangePassword = 1,
 }
 
-#[derive(Debug, Serialize, Deserialize, Type, Zeroize, ZeroizeOnDrop)]
+#[derive(Serialize, Deserialize, Type, Zeroize, ZeroizeOnDrop)]
 struct PamMessage {
     #[zeroize(skip)]
     operation: PamOperation,

server/src/plasma/prompter.rs

@@ -19,7 +19,7 @@ use crate::{
 };
 
 #[repr(i32)]
-#[derive(Debug, Type, Serialize)]
+#[derive(Type, Serialize)]
 pub enum CallbackAction {
     Dismiss = 0,
     Keep = 1,
@@ -77,7 +77,7 @@ pub trait PlasmaPrompter {
     ) -> Result<(), ServiceError>;
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct PlasmaPrompterCallback {
     service: Service,
     prompt_path: OwnedObjectPath,

server/src/prompt/mod.rs

@@ -75,19 +75,6 @@ pub struct Prompt {
     action: Arc<Mutex<Option<PromptAction>>>,
 }
 
-// Manual impl because OnceCell doesn't impl Debug
-impl std::fmt::Debug for Prompt {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Prompt")
-            .field("service", &self.service)
-            .field("role", &self.role)
-            .field("path", &self.path)
-            .field("label", &self.label)
-            .field("collection", &self.collection)
-            .finish()
-    }
-}
-
 #[cfg(any(
     feature = "gnome_openssl_crypto",
     feature = "gnome_native_crypto",
@@ -114,9 +101,9 @@ impl Prompt {
                     PlasmaPrompterCallback::new(self.service.clone(), self.path.clone()).await;
                 let path = OwnedObjectPath::from(callback.path().clone());
 
-                self.plasma_callback
-                    .set(callback.clone())
-                    .expect("A prompt callback is only set once");
+                // We are sure the callback is not set at this point, so it is fine to ignore
+                // the result of set
+                let _ = self.plasma_callback.set(callback.clone());
                 self.service
                     .object_server()
                     .at(&path, callback.clone())
@@ -147,10 +134,9 @@ impl Prompt {
 
                 let path = OwnedObjectPath::from(callback.path().clone());
 
-                self.gnome_callback
-                    .set(callback.clone())
-                    .expect("A prompt callback is only set once");
-
+                // We are sure the callback is not set at this point, so it is fine to ignore
+                // the result of set
+                let _ = self.gnome_callback.set(callback.clone());
                 self.service.object_server().at(&path, callback).await?;
                 tracing::debug!("Prompt `{}` created.", self.path);
 

server/src/service/mod.rs

@@ -38,14 +38,14 @@ const DEFAULT_COLLECTION_ALIAS_PATH: ObjectPath<'static> =
     ObjectPath::from_static_str_unchecked("/org/freedesktop/secrets/aliases/default");
 
 /// Prompter type
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub enum PrompterType {
     #[allow(clippy::upper_case_acronyms)]
     GNOME,
     Plasma,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Service {
     // Properties
     pub(crate) collections: Arc<Mutex<HashMap<OwnedObjectPath, Collection>>>,