diff options
| author | Zeyla Hellyer <[email protected]> | 2017-08-18 16:14:32 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-08-18 17:52:53 -0700 |
| commit | e4113570967a1fb13539efbfa2cf7285b19d95ba (patch) | |
| tree | 06bb020fcfaa5f8323454dfb525272314a900186 /src/model/guild/member.rs | |
| parent | Move Clippy lints to a cfg_attr (diff) | |
| download | serenity-e4113570967a1fb13539efbfa2cf7285b19d95ba.tar.xz serenity-e4113570967a1fb13539efbfa2cf7285b19d95ba.zip | |
Apply rustfmt
Diffstat (limited to 'src/model/guild/member.rs')
| -rw-r--r-- | src/model/guild/member.rs | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs index 38033e3..819a4e9 100644 --- a/src/model/guild/member.rs +++ b/src/model/guild/member.rs @@ -168,10 +168,9 @@ impl Member { let default = Colour::default(); - roles - .iter() - .find(|r| r.colour.0 != default.0) - .map(|r| r.colour) + roles.iter().find(|r| r.colour.0 != default.0).map( + |r| r.colour, + ) } /// Calculates the member's display name. @@ -179,10 +178,9 @@ impl Member { /// The nickname takes priority over the member's username if it exists. #[inline] pub fn display_name(&self) -> Cow<String> { - self.nick - .as_ref() - .map(Cow::Borrowed) - .unwrap_or_else(|| Cow::Owned(self.user.read().unwrap().name.clone())) + self.nick.as_ref().map(Cow::Borrowed).unwrap_or_else(|| { + Cow::Owned(self.user.read().unwrap().name.clone()) + }) } /// Returns the DiscordTag of a Member, taking possible nickname into account. @@ -248,12 +246,11 @@ impl Member { { let req = permissions::KICK_MEMBERS; - let has_perms = CACHE - .read() - .unwrap() - .guilds - .get(&self.guild_id) - .map(|guild| guild.read().unwrap().has_perms(req)); + let has_perms = CACHE.read().unwrap().guilds.get(&self.guild_id).map( + |guild| { + guild.read().unwrap().has_perms(req) + }, + ); if let Some(Ok(false)) = has_perms { return Err(Error::Model(ModelError::InvalidPermissions(req))); @@ -288,10 +285,10 @@ impl Member { let guild = guild.read().unwrap(); - Ok( - guild - .permissions_for(ChannelId(guild.id.0), self.user.read().unwrap().id), - ) + Ok(guild.permissions_for( + ChannelId(guild.id.0), + self.user.read().unwrap().id, + )) } /// Removes a [`Role`] from the member, editing its roles in-place if the |