diff options
| author | Zeyla Hellyer <[email protected]> | 2017-04-25 15:48:13 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-04-25 15:48:13 -0700 |
| commit | 0f41ffc811827fdd45e4e631884909e33fa8769e (patch) | |
| tree | 40c6d5091097ee86ed72e9868f77350bdaed078a /src/model/guild | |
| parent | Fix decoding for `CurrentUser.discriminator` (diff) | |
| download | serenity-0f41ffc811827fdd45e4e631884909e33fa8769e.tar.xz serenity-0f41ffc811827fdd45e4e631884909e33fa8769e.zip | |
Make `User.discriminator` a u16
Change the User struct's `discriminator` field to a u16 for performance.
The User struct's `discriminator` field was previously a u16 but changed
to a `String` for ease-of-use. Lately the library has been gearing more
towards performance where possible while not sacrificing ergonomics
_too much_ in most scenarios.
Diffstat (limited to 'src/model/guild')
| -rw-r--r-- | src/model/guild/mod.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs index bd9a7ee..0daeec1 100644 --- a/src/model/guild/mod.rs +++ b/src/model/guild/mod.rs @@ -686,12 +686,13 @@ impl Guild { /// /// [`Member`]: struct.Member.html pub fn member_named(&self, name: &str) -> Option<&Member> { - let hash_pos = name.find('#'); - - let (name, discrim) = if let Some(pos) = hash_pos { + let (name, discrim) = if let Some(pos) = name.find('#') { let split = name.split_at(pos); - (split.0, Some(split.1)) + match split.1.parse::<u16>() { + Ok(discrim_int) => (split.0, Some(discrim_int)), + Err(_) => (name, None), + } } else { (&name[..], None) }; |