From 3cd19ed15edd6a689e3a1460d7b0ffbd025714ad Mon Sep 17 00:00:00 2001 From: bitfl0wer Date: Sun, 7 May 2023 11:32:25 +0200 Subject: [PATCH] Remove display impl, add default trait --- src/api/policies/instance/limits.rs | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/src/api/policies/instance/limits.rs b/src/api/policies/instance/limits.rs index 58d55c5..fa797b2 100644 --- a/src/api/policies/instance/limits.rs +++ b/src/api/policies/instance/limits.rs @@ -1,16 +1,17 @@ pub mod limits { - use std::collections::HashMap; + use std::{collections::HashMap, default}; use reqwest::Client; use serde::{Deserialize, Serialize}; use serde_json::from_str; - #[derive(Clone, Copy, Eq, Hash, PartialEq, Debug)] + #[derive(Clone, Copy, Eq, Hash, PartialEq, Debug, Default)] pub enum LimitType { AuthRegister, AuthLogin, AbsoluteMessage, AbsoluteRegister, + #[default] Global, Ip, Channel, @@ -19,23 +20,6 @@ pub mod limits { Webhook, } - impl std::fmt::Display for LimitType { - fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - match self { - LimitType::AuthRegister => write!(f, "auth_register"), - LimitType::AuthLogin => write!(f, "auth_login"), - LimitType::AbsoluteMessage => write!(f, "absolute_message"), - LimitType::AbsoluteRegister => write!(f, "absolute_register"), - LimitType::Global => write!(f, "global"), - LimitType::Ip => write!(f, "ip"), - LimitType::Channel => write!(f, "channel"), - LimitType::Error => write!(f, "error"), - LimitType::Guild => write!(f, "guild"), - LimitType::Webhook => write!(f, "webhook"), - } - } - } - #[derive(Debug, Deserialize, Serialize)] #[allow(non_snake_case)] pub struct User { @@ -134,7 +118,7 @@ pub mod limits { pub absoluteRate: AbsoluteRate, } - #[derive(Clone, Copy, Debug, PartialEq, Eq)] + #[derive(Clone, Copy, Debug, PartialEq, Eq, Default)] pub struct Limit { pub bucket: LimitType, pub limit: u64, @@ -146,7 +130,7 @@ pub mod limits { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!( f, - "Bucket: {}, Limit: {}, Remaining: {}, Reset: {}", + "Bucket: {:?}, Limit: {}, Remaining: {}, Reset: {}", self.bucket, self.limit, self.remaining, self.reset ) } @@ -229,7 +213,7 @@ pub mod limits { } } - #[derive(Debug, Clone)] + #[derive(Debug, Clone, Default)] pub struct Limits { pub limit_absolute_messages: Limit, pub limit_absolute_register: Limit,