diff options
| author | Mei Boudreau <[email protected]> | 2017-11-23 10:34:30 -0500 |
|---|---|---|
| committer | alex <[email protected]> | 2017-11-23 16:34:30 +0100 |
| commit | 2d23d8b50386e38fece6987286bd0b3d56d1cada (patch) | |
| tree | c96a8f0c59d5c67fbe4241ca723fbbe03cacc04c /src | |
| parent | Add `before`/`after` middleware to `Command` (diff) | |
| download | serenity-2d23d8b50386e38fece6987286bd0b3d56d1cada.tar.xz serenity-2d23d8b50386e38fece6987286bd0b3d56d1cada.zip | |
Convert from macro to ? (#226)
Diffstat (limited to 'src')
| -rw-r--r-- | src/framework/standard/args.rs | 2 | ||||
| -rw-r--r-- | src/internal/macros.rs | 8 | ||||
| -rw-r--r-- | src/model/guild/member.rs | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/framework/standard/args.rs b/src/framework/standard/args.rs index 1425e4c..47312ca 100644 --- a/src/framework/standard/args.rs +++ b/src/framework/standard/args.rs @@ -193,7 +193,7 @@ impl Args { let mut vec = Vec::with_capacity(i as usize); for _ in 0..i { - vec.push(try_opt!(self.delimiter_split.shift())); + vec.push(self.delimiter_split.shift()?); } Some(vec) diff --git a/src/internal/macros.rs b/src/internal/macros.rs index 3bcc5c5..4ee43d3 100644 --- a/src/internal/macros.rs +++ b/src/internal/macros.rs @@ -181,11 +181,3 @@ macro_rules! enum_number { } } } - -#[allow(unused_macros)] -macro_rules! try_opt { - ($x:expr) => (match $x { - Some(v) => v, - None => return None, - }); -} diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs index 74b0f69..5353fd4 100644 --- a/src/model/guild/member.rs +++ b/src/model/guild/member.rs @@ -159,7 +159,7 @@ impl Member { #[cfg(all(feature = "cache", feature = "utils"))] pub fn colour(&self) -> Option<Colour> { let cache = CACHE.read(); - let guild = try_opt!(cache.guilds.get(&self.guild_id)).read(); + let guild = cache.guilds.get(&self.guild_id)?.read(); let mut roles = self.roles .iter() |