Use derive default where possible

This commit is contained in:
Bilal Elmoussaoui 2022-12-24 20:09:58 +01:00
parent 64b4995030
commit 07043dc272
2 changed files with 6 additions and 21 deletions

View file

@ -3,8 +3,9 @@ use std::{fmt, path::Path};
use url::Url; use url::Url;
/// Supported image formats. /// Supported image formats.
#[derive(Debug, PartialEq, Eq, Clone, Copy, PartialOrd, Ord)] #[derive(Debug, Default, PartialEq, Eq, Clone, Copy, PartialOrd, Ord)]
pub enum Format { pub enum Format {
#[default]
Png, Png,
Svg, Svg,
Ico, Ico,
@ -79,9 +80,3 @@ impl fmt::Display for Format {
} }
} }
} }
impl Default for Format {
fn default() -> Self {
Self::Png
}
}

View file

@ -6,23 +6,18 @@ use ring::hmac;
use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize}; use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
#[allow(clippy::upper_case_acronyms)] #[allow(clippy::upper_case_acronyms)]
#[derive(Debug, Eq, PartialEq, Clone, Copy, glib::Enum)] #[derive(Debug, Default, Eq, PartialEq, Clone, Copy, glib::Enum)]
#[repr(u32)] #[repr(u32)]
#[enum_type(name = "OTPMethod")] #[enum_type(name = "OTPMethod")]
pub enum OTPMethod { pub enum OTPMethod {
#[enum_value(name = "TOTP")] #[enum_value(name = "TOTP")]
#[default]
TOTP = 0, TOTP = 0,
#[enum_value(name = "HOTP")] #[enum_value(name = "HOTP")]
HOTP = 1, HOTP = 1,
Steam = 2, Steam = 2,
} }
impl Default for OTPMethod {
fn default() -> Self {
Self::TOTP
}
}
impl Serialize for OTPMethod { impl Serialize for OTPMethod {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where where
@ -90,11 +85,12 @@ impl ToString for OTPMethod {
} }
#[allow(clippy::upper_case_acronyms)] #[allow(clippy::upper_case_acronyms)]
#[derive(Debug, Eq, PartialEq, Clone, Copy, glib::Enum)] #[derive(Debug, Default, Eq, PartialEq, Clone, Copy, glib::Enum)]
#[repr(u32)] #[repr(u32)]
#[enum_type(name = "Algorithm")] #[enum_type(name = "Algorithm")]
pub enum Algorithm { pub enum Algorithm {
#[enum_value(name = "SHA1")] #[enum_value(name = "SHA1")]
#[default]
SHA1 = 0, SHA1 = 0,
#[enum_value(name = "SHA256")] #[enum_value(name = "SHA256")]
SHA256 = 1, SHA256 = 1,
@ -102,12 +98,6 @@ pub enum Algorithm {
SHA512 = 2, SHA512 = 2,
} }
impl Default for Algorithm {
fn default() -> Self {
Self::SHA1
}
}
impl Serialize for Algorithm { impl Serialize for Algorithm {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where where