diff options
| author | Zeyla Hellyer <[email protected]> | 2017-09-18 17:48:52 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-09-18 17:48:52 -0700 |
| commit | dae2cb77b407044f44a7a2790d93efba3891854e (patch) | |
| tree | bef263c4490536cf8b56e988e71dd1aa43bc2696 /src/model/user.rs | |
| parent | Fix compiles of a variety of feature combinations (diff) | |
| download | serenity-dae2cb77b407044f44a7a2790d93efba3891854e.tar.xz serenity-dae2cb77b407044f44a7a2790d93efba3891854e.zip | |
Apply rustfmt
Diffstat (limited to 'src/model/user.rs')
| -rw-r--r-- | src/model/user.rs | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/src/model/user.rs b/src/model/user.rs index c65a860..fb6acf0 100644 --- a/src/model/user.rs +++ b/src/model/user.rs @@ -25,14 +25,11 @@ use http::{self, GuildPagination}; pub struct CurrentUser { pub id: UserId, pub avatar: Option<String>, - #[serde(default)] - pub bot: bool, - #[serde(deserialize_with = "deserialize_u16")] - pub discriminator: u16, + #[serde(default)] pub bot: bool, + #[serde(deserialize_with = "deserialize_u16")] pub discriminator: u16, pub email: Option<String>, pub mfa_enabled: bool, - #[serde(rename = "username")] - pub name: String, + #[serde(rename = "username")] pub name: String, pub verified: bool, } @@ -88,10 +85,7 @@ impl CurrentUser { pub fn edit<F>(&mut self, f: F) -> Result<()> where F: FnOnce(EditProfile) -> EditProfile { let mut map = Map::new(); - map.insert( - "username".to_owned(), - Value::String(self.name.clone()), - ); + map.insert("username".to_owned(), Value::String(self.name.clone())); if let Some(email) = self.email.as_ref() { map.insert("email".to_owned(), Value::String(email.clone())); @@ -116,9 +110,8 @@ impl CurrentUser { /// [`avatar_url`]: #method.avatar_url /// [`default_avatar_url`]: #method.default_avatar_url pub fn face(&self) -> String { - self.avatar_url().unwrap_or_else( - || self.default_avatar_url(), - ) + self.avatar_url() + .unwrap_or_else(|| self.default_avatar_url()) } /// Gets a list of guilds that the current user is in. @@ -326,16 +319,11 @@ enum_number!( /// [`Invisible`]: #variant.Invisible #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, PartialOrd, Ord, Serialize)] pub enum OnlineStatus { - #[serde(rename = "dnd")] - DoNotDisturb, - #[serde(rename = "idle")] - Idle, - #[serde(rename = "invisible")] - Invisible, - #[serde(rename = "offline")] - Offline, - #[serde(rename = "online")] - Online, + #[serde(rename = "dnd")] DoNotDisturb, + #[serde(rename = "idle")] Idle, + #[serde(rename = "invisible")] Invisible, + #[serde(rename = "offline")] Offline, + #[serde(rename = "online")] Online, } impl OnlineStatus { @@ -489,8 +477,7 @@ impl User { return Err(Error::Model(ModelError::MessagingBot)); } - let private_channel_id = - feature_cache! { + let private_channel_id = feature_cache! { { let finding = { let cache = CACHE.read().unwrap(); @@ -559,9 +546,8 @@ impl User { /// [`avatar_url`]: #method.avatar_url /// [`default_avatar_url`]: #method.default_avatar_url pub fn face(&self) -> String { - self.avatar_url().unwrap_or_else( - || self.default_avatar_url(), - ) + self.avatar_url() + .unwrap_or_else(|| self.default_avatar_url()) } /// Check if a user has a [`Role`]. This will retrieve the [`Guild`] from @@ -807,9 +793,7 @@ fn default_avatar_url(discriminator: u16) -> String { #[cfg(feature = "model")] fn static_avatar_url(user_id: UserId, hash: Option<&String>) -> Option<String> { - hash.map( - |hash| cdn!("/avatars/{}/{}.webp?size=1024", user_id, hash), - ) + hash.map(|hash| cdn!("/avatars/{}/{}.webp?size=1024", user_id, hash)) } #[cfg(feature = "model")] |