aboutsummaryrefslogtreecommitdiff
path: root/src/model/guild/member.rs
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-09-18 17:48:52 -0700
committerZeyla Hellyer <[email protected]>2017-09-18 17:48:52 -0700
commitdae2cb77b407044f44a7a2790d93efba3891854e (patch)
treebef263c4490536cf8b56e988e71dd1aa43bc2696 /src/model/guild/member.rs
parentFix compiles of a variety of feature combinations (diff)
downloadserenity-dae2cb77b407044f44a7a2790d93efba3891854e.tar.xz
serenity-dae2cb77b407044f44a7a2790d93efba3891854e.zip
Apply rustfmt
Diffstat (limited to 'src/model/guild/member.rs')
-rw-r--r--src/model/guild/member.rs33
1 files changed, 18 insertions, 15 deletions
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index fcd2ccd..3e8ae64 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -168,9 +168,10 @@ 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.
@@ -178,9 +179,10 @@ 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.
@@ -246,11 +248,12 @@ 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)));
@@ -294,10 +297,10 @@ impl Member {
None => return Err(From::from(ModelError::ItemMissing)),
};
- Ok(guild.permissions_for(
- default_channel.id,
- self.user.read().unwrap().id,
- ))
+ Ok(
+ guild
+ .permissions_for(default_channel.id, self.user.read().unwrap().id),
+ )
}
/// Removes a [`Role`] from the member, editing its roles in-place if the