aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-02-28 12:02:40 -0800
committerZeyla Hellyer <[email protected]>2017-02-28 12:02:40 -0800
commitf0d53514f12be5a4080b675a882c9bd263e19e74 (patch)
tree86a729892f5e3021ebd57d8dd762fc6abb7a2f9d
parentPass by reference where possible (diff)
downloadserenity-f0d53514f12be5a4080b675a882c9bd263e19e74.tar.xz
serenity-f0d53514f12be5a4080b675a882c9bd263e19e74.zip
Fix some clippy lints
-rw-r--r--src/client/mod.rs1
-rw-r--r--src/client/rest/ratelimiting.rs6
-rw-r--r--tests/test_msg_builder.rs4
3 files changed, 5 insertions, 6 deletions
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 0261833..e9ba20b 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -18,6 +18,7 @@
//! [`Client`]: struct.Client.html#examples
//! [`Context`]: struct.Context.html
//! [Client examples]: struct.Client.html#examples
+#![allow(zero_ptr)]
pub mod gateway;
pub mod rest;
diff --git a/src/client/rest/ratelimiting.rs b/src/client/rest/ratelimiting.rs
index 2f252ac..8e3cce7 100644
--- a/src/client/rest/ratelimiting.rs
+++ b/src/client/rest/ratelimiting.rs
@@ -214,12 +214,10 @@ pub fn perform<'a, F>(route: Route, f: F) -> Result<Response>
.post_hook(&response)
};
- if redo.unwrap_or(false) {
- continue;
+ if !redo.unwrap_or(true) {
+ return Ok(response);
}
}
-
- return Ok(response);
}
}
diff --git a/tests/test_msg_builder.rs b/tests/test_msg_builder.rs
index 6ac14ef..10c4d51 100644
--- a/tests/test_msg_builder.rs
+++ b/tests/test_msg_builder.rs
@@ -19,7 +19,7 @@ fn safe_content() {
let content = MessageBuilder::new()
.push_safe("@everyone discord.gg/discord-api")
.build();
- assert!(content != "@everyone discord.gg/discord-api");
+ assert_ne!(content, "@everyone discord.gg/discord-api");
}
@@ -28,7 +28,7 @@ fn no_free_formatting() {
let content = MessageBuilder::new()
.push_bold_safe("test**test")
.build();
- assert!(content != "**test**test**");
+ assert_ne!(content, "**test**test**");
}
#[test]