diff options
| author | Smitty <me@smitop.com> | 2021-07-11 11:33:39 -0400 |
|---|---|---|
| committer | Smitty <me@smitop.com> | 2021-07-11 11:33:39 -0400 |
| commit | a331e5fd2c925134b8a457ded7c34f9558bb8e26 (patch) | |
| tree | 451024bef111edb0c6687c75693129ab0e6e62ff | |
| parent | b9b97bbb9d3503381de4b1beb5fcbf69e8e4c68d (diff) | |
| download | rust-a331e5fd2c925134b8a457ded7c34f9558bb8e26.tar.gz rust-a331e5fd2c925134b8a457ded7c34f9558bb8e26.zip | |
Simplify leading zero checks
| -rw-r--r-- | library/std/src/net/parser.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/library/std/src/net/parser.rs b/library/std/src/net/parser.rs index df6bbdeab89..e233d605ce5 100644 --- a/library/std/src/net/parser.rs +++ b/library/std/src/net/parser.rs @@ -12,7 +12,7 @@ use crate::fmt; use crate::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use crate::str::FromStr; -trait ReadNumberHelper: crate::marker::Sized + crate::cmp::PartialEq { +trait ReadNumberHelper: crate::marker::Sized { const ZERO: Self; fn checked_mul(&self, other: u32) -> Option<Self>; fn checked_add(&self, other: u32) -> Option<Self>; @@ -131,10 +131,7 @@ impl<'a> Parser<'a> { if digit_count == 0 { None - } else if !allow_zero_prefix - && has_leading_zero - && (result != T::ZERO || result == T::ZERO && digit_count > 1) - { + } else if !allow_zero_prefix && has_leading_zero && digit_count > 1 { None } else { Some(result) |