aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-12-16 13:24:09 -0800
committerZeyla Hellyer <[email protected]>2017-12-16 13:24:09 -0800
commit9b53582f5e5e9650abda4106124e7f9f4e78a90c (patch)
tree88bd56a75b1d110ea049abbaea88bb6e8a83dac3 /src/model
parentFix compilation of examples (diff)
downloadserenity-9b53582f5e5e9650abda4106124e7f9f4e78a90c.tar.xz
serenity-9b53582f5e5e9650abda4106124e7f9f4e78a90c.zip
Fix most clippy lints, take more refeernces
Fix clippy lints and subsequently accept references for more function parameters.
Diffstat (limited to 'src/model')
-rw-r--r--src/model/guild/guild_id.rs3
-rw-r--r--src/model/guild/member.rs4
-rw-r--r--src/model/guild/mod.rs8
-rw-r--r--src/model/guild/partial_guild.rs2
4 files changed, 9 insertions, 8 deletions
diff --git a/src/model/guild/guild_id.rs b/src/model/guild/guild_id.rs
index ad5866d..2453fc6 100644
--- a/src/model/guild/guild_id.rs
+++ b/src/model/guild/guild_id.rs
@@ -48,7 +48,8 @@ impl GuildId {
/// [`Guild::ban`]: struct.Guild.html#method.ban
/// [`User`]: struct.User.html
/// [Ban Members]: permissions/constant.BAN_MEMBERS.html
- pub fn ban<U: Into<UserId>, BO: BanOptions>(&self, user: U, ban_options: BO) -> Result<()> {
+ pub fn ban<U, BO>(&self, user: U, ban_options: &BO) -> Result<()>
+ where U: Into<UserId>, BO: BanOptions {
let dmd = ban_options.dmd();
if dmd > 7 {
return Err(Error::Model(ModelError::DeleteMessageDaysAmount(dmd)));
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index 0e8c4f6..166eb55 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -135,7 +135,7 @@ impl Member {
///
/// [Ban Members]: permissions/constant.BAN_MEMBERS.html
#[cfg(feature = "cache")]
- pub fn ban<BO: BanOptions>(&self, ban_options: BO) -> Result<()> {
+ pub fn ban<BO: BanOptions>(&self, ban_options: &BO) -> Result<()> {
let dmd = ban_options.dmd();
if dmd > 7 {
return Err(Error::Model(ModelError::DeleteMessageDaysAmount(dmd)));
@@ -189,7 +189,7 @@ impl Member {
for (cid, channel) in &reader.channels {
if reader.permissions_in(*cid, self.user.read().id).read_messages() {
- return Some(channel.clone());
+ return Some(Arc::clone(channel));
}
}
diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs
index d6a2c50..1011891 100644
--- a/src/model/guild/mod.rs
+++ b/src/model/guild/mod.rs
@@ -144,7 +144,7 @@ impl Guild {
pub fn default_channel(&self, uid: UserId) -> Option<Arc<RwLock<GuildChannel>>> {
for (cid, channel) in &self.channels {
if self.permissions_in(*cid, uid).read_messages() {
- return Some(Arc::clone(&channel));
+ return Some(Arc::clone(channel));
}
}
@@ -160,7 +160,7 @@ impl Guild {
for (cid, channel) in &self.channels {
for memid in self.members.keys() {
if self.permissions_in(*cid, *memid).read_messages() {
- return Some(Arc::clone(&channel));
+ return Some(Arc::clone(channel));
}
}
}
@@ -208,7 +208,7 @@ impl Guild {
/// [`Guild::ban`]: struct.Guild.html#method.ban
/// [`User`]: struct.User.html
/// [Ban Members]: permissions/constant.BAN_MEMBERS.html
- pub fn ban<U: Into<UserId>, BO: BanOptions>(&self, user: U, options: BO) -> Result<()> {
+ pub fn ban<U: Into<UserId>, BO: BanOptions>(&self, user: U, options: &BO) -> Result<()> {
#[cfg(feature = "cache")]
{
let req = Permissions::BAN_MEMBERS;
@@ -1039,7 +1039,7 @@ impl Guild {
let mut permissions = everyone.permissions;
for role in &member.roles {
- if let Some(role) = self.roles.get(&role) {
+ if let Some(role) = self.roles.get(role) {
if role.permissions.contains(Permissions::ADMINISTRATOR) {
return Permissions::all();
}
diff --git a/src/model/guild/partial_guild.rs b/src/model/guild/partial_guild.rs
index d5312b5..cd51a98 100644
--- a/src/model/guild/partial_guild.rs
+++ b/src/model/guild/partial_guild.rs
@@ -66,7 +66,7 @@ impl PartialGuild {
));
}
- self.id.ban(user, delete_message_days)
+ self.id.ban(user, &delete_message_days)
}
/// Gets a list of the guild's bans.