aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaiddog <[email protected]>2018-03-17 13:07:42 -0500
committeralex <[email protected]>2018-03-17 19:07:42 +0100
commitb71d99fde84135fa66f73c4817d340ffbe8bddae (patch)
tree9061c50b8631c7aee1c5317f00a1b15c46e85da6 /src
parentFix no-cache standardframework compilation (#290) (diff)
downloadserenity-b71d99fde84135fa66f73c4817d340ffbe8bddae.tar.xz
serenity-b71d99fde84135fa66f73c4817d340ffbe8bddae.zip
Remove useless clones (#292)
Diffstat (limited to 'src')
-rw-r--r--src/client/context.rs2
-rw-r--r--src/framework/standard/help_commands.rs14
-rw-r--r--src/model/event.rs6
-rw-r--r--src/model/gateway.rs2
4 files changed, 12 insertions, 12 deletions
diff --git a/src/client/context.rs b/src/client/context.rs
index 6cada3c..dcb1d48 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -100,7 +100,7 @@ impl Context {
} else {
let user = http::get_current_user()?;
- map.insert("username", Value::String(user.name.clone()));
+ map.insert("username", Value::String(user.name));
if let Some(email) = user.email {
map.insert("email", Value::String(email));
diff --git a/src/framework/standard/help_commands.rs b/src/framework/standard/help_commands.rs
index 0a76636..9979423 100644
--- a/src/framework/standard/help_commands.rs
+++ b/src/framework/standard/help_commands.rs
@@ -156,20 +156,20 @@ pub fn with_embeds<H: BuildHasher>(
let _ = msg.channel_id.send_message(|m| {
m.embed(|e| {
- let mut embed = e.colour(help_options.embed_success_colour).title(command_name.clone());
+ let mut embed = e.colour(help_options.embed_success_colour).title(command_name);
if let Some(ref desc) = command.desc {
embed = embed.description(desc);
}
if let Some(ref usage) = command.usage {
- let value = format!("`{} {}`", command_name.clone(), usage);
+ let value = format!("`{} {}`", command_name, usage);
embed = embed.field(&help_options.usage_label, value, true);
}
if let Some(ref example) = command.example {
- let value = format!("`{} {}`", command_name.clone(), example);
+ let value = format!("`{} {}`", command_name, example);
embed = embed.field(&help_options.usage_sample_label, value, true);
}
@@ -211,9 +211,9 @@ pub fn with_embeds<H: BuildHasher>(
let _ = msg.channel_id.send_message(|m| {
m.embed(|mut e| {
- if let Some(striked_command_text) = help_options.striked_commands_tip.clone() {
+ if let Some(ref striked_command_text) = help_options.striked_commands_tip {
e = e.colour(help_options.embed_success_colour).description(
- format!("{}\n{}", &help_options.individual_command_tip, &striked_command_text),
+ format!("{}\n{}", &help_options.individual_command_tip, striked_command_text),
);
} else {
e = e.colour(help_options.embed_success_colour).description(
@@ -449,8 +449,8 @@ pub fn plain<H: BuildHasher>(
let mut result = "**Commands**\n".to_string();
- if let Some(striked_command_text) = help_options.striked_commands_tip.clone() {
- let _ = write!(result, "{}\n{}\n\n", &help_options.individual_command_tip, &striked_command_text);
+ if let Some(ref striked_command_text) = help_options.striked_commands_tip {
+ let _ = write!(result, "{}\n{}\n\n", &help_options.individual_command_tip, striked_command_text);
} else {
let _ = write!(result, "{}\n\n", &help_options.individual_command_tip);
}
diff --git a/src/model/event.rs b/src/model/event.rs
index 6a58ce4..cf18995 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -479,7 +479,7 @@ impl<'de> Deserialize<'de> for GuildMemberAddEvent {
let guild_id = map.get("guild_id")
.ok_or_else(|| DeError::custom("missing member add guild id"))
- .and_then(|v| GuildId::deserialize(v.clone()))
+ .and_then(|v| GuildId::deserialize(v))
.map_err(DeError::custom)?;
Ok(GuildMemberAddEvent {
@@ -595,7 +595,7 @@ impl<'de> Deserialize<'de> for GuildMembersChunkEvent {
let guild_id = map.get("guild_id")
.ok_or_else(|| DeError::custom("missing member chunk guild id"))
- .and_then(|v| GuildId::deserialize(v.clone()))
+ .and_then(|v| GuildId::deserialize(v))
.map_err(DeError::custom)?;
let mut members = map.remove("members")
@@ -1136,7 +1136,7 @@ impl<'de> Deserialize<'de> for VoiceStateUpdateEvent {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> StdResult<Self, D::Error> {
let map = JsonMap::deserialize(deserializer)?;
let guild_id = match map.get("guild_id") {
- Some(v) => Some(GuildId::deserialize(v.clone()).map_err(DeError::custom)?),
+ Some(v) => Some(GuildId::deserialize(v).map_err(DeError::custom)?),
None => None,
};
diff --git a/src/model/gateway.rs b/src/model/gateway.rs
index 6ad2cda..924f27f 100644
--- a/src/model/gateway.rs
+++ b/src/model/gateway.rs
@@ -229,7 +229,7 @@ impl<'de> Deserialize<'de> for Presence {
let user_id = user_map
.remove("id")
.ok_or_else(|| DeError::custom("Missing presence user id"))
- .and_then(|x| UserId::deserialize(x.clone()))
+ .and_then(|x| UserId::deserialize(x))
.map_err(DeError::custom)?;
(user_id, None)