aboutsummaryrefslogtreecommitdiff
path: root/src/model/misc.rs
diff options
context:
space:
mode:
authoracdenisSK <[email protected]>2017-07-27 08:10:41 +0200
committeracdenisSK <[email protected]>2017-07-27 08:10:41 +0200
commit70b5097aaac85f970c32ceb988dbb5f5d575ee0f (patch)
treed2f391d3b552cfae58b74748a2a2aa5ae80c7986 /src/model/misc.rs
parentrustfmt (diff)
downloadserenity-70b5097aaac85f970c32ceb988dbb5f5d575ee0f.tar.xz
serenity-70b5097aaac85f970c32ceb988dbb5f5d575ee0f.zip
Change the config a bit, and a few nitpicks
Diffstat (limited to 'src/model/misc.rs')
-rw-r--r--src/model/misc.rs24
1 files changed, 9 insertions, 15 deletions
diff --git a/src/model/misc.rs b/src/model/misc.rs
index 9420968..d2c17c5 100644
--- a/src/model/misc.rs
+++ b/src/model/misc.rs
@@ -58,11 +58,9 @@ impl FromStr for User {
fn from_str(s: &str) -> StdResult<Self, ()> {
match utils::parse_username(s) {
- Some(x) => {
- match UserId(x as u64).find() {
- Some(user) => Ok(user.read().unwrap().clone()),
- _ => Err(()),
- }
+ Some(x) => match UserId(x as u64).find() {
+ Some(user) => Ok(user.read().unwrap().clone()),
+ _ => Err(()),
},
_ => Err(()),
}
@@ -84,11 +82,9 @@ impl FromStr for Role {
fn from_str(s: &str) -> StdResult<Self, ()> {
match utils::parse_role(s) {
- Some(x) => {
- match RoleId(x).find() {
- Some(user) => Ok(user),
- _ => Err(()),
- }
+ Some(x) => match RoleId(x).find() {
+ Some(user) => Ok(user),
+ _ => Err(()),
},
_ => Err(()),
}
@@ -143,11 +139,9 @@ impl FromStr for Channel {
fn from_str(s: &str) -> StdResult<Self, ()> {
match utils::parse_channel(s) {
- Some(x) => {
- match ChannelId(x).find() {
- Some(channel) => Ok(channel),
- _ => Err(()),
- }
+ Some(x) => match ChannelId(x).find() {
+ Some(channel) => Ok(channel),
+ _ => Err(()),
},
_ => Err(()),
}