aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorAustin Hellyer <[email protected]>2016-11-17 10:46:58 -0800
committerAustin Hellyer <[email protected]>2016-11-17 10:46:58 -0800
commit953617280ddae82c847c0db65ebfcc92e73b4682 (patch)
treed8d57f9c97dbfbf9153e8ba3f1b7a5b7184844f2 /src/model
parentAdd a build decoder for u64s with a default (diff)
downloadserenity-953617280ddae82c847c0db65ebfcc92e73b4682.tar.xz
serenity-953617280ddae82c847c0db65ebfcc92e73b4682.zip
Decode discriminators as strings
While this will use a slightly higher amount of memory, it will be easier for users to use.
Diffstat (limited to 'src/model')
-rw-r--r--src/model/guild.rs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/model/guild.rs b/src/model/guild.rs
index 557a851..538aa02 100644
--- a/src/model/guild.rs
+++ b/src/model/guild.rs
@@ -517,14 +517,9 @@ impl LiveGuild {
let (name, discrim) = if let Some(pos) = hash_pos {
let split = name.split_at(pos);
- let discrim = match split.1.parse::<u16>() {
- Ok(discrim) => discrim,
- Err(_why) => return None,
- };
-
- (split.0, Some(discrim))
+ (split.0, Some(split.1))
} else {
- (&name[..], None::<u16>)
+ (&name[..], None)
};
self.members