From a57e15c9f32b079e941e3551ffd1050ebd2107cf Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 20 Jun 2022 22:14:19 +0200 Subject: [PATCH] Simplify encoding snowflakes --- cove-tui/src/euph/api/types.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cove-tui/src/euph/api/types.rs b/cove-tui/src/euph/api/types.rs index 357db74..2d18bd6 100644 --- a/cove-tui/src/euph/api/types.rs +++ b/cove-tui/src/euph/api/types.rs @@ -300,13 +300,8 @@ impl<'de> de::Visitor<'de> for SnowflakeVisitor { if v.len() != 13 { return Err(E::invalid_length(v.len(), &self)); } - let mut n = 0; - for c in v.chars() { - let digit = c - .to_digit(36) - .ok_or_else(|| E::invalid_value(de::Unexpected::Str(v), &self))?; - n = n * 36 + digit as u64; - } + let n = u64::from_str_radix(v, 36) + .map_err(|_| E::invalid_value(de::Unexpected::Str(v), &self))?; Ok(Snowflake(n)) } }