diff --git a/rustfmt.toml b/rustfmt.toml index bc80098..2f5a5fe 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,5 +1,5 @@ #unstable_features = true -max_width = 150 +max_width = 120 #use_small_heuristics = "Max" edition = "2021" #empty_item_single_line = true diff --git a/src/buffer.rs b/src/buffer.rs index 939d9ae..d7114af 100644 --- a/src/buffer.rs +++ b/src/buffer.rs @@ -406,7 +406,9 @@ impl Buffer { let end = ptr + 2; debug_assert!(end <= L); if end <= self.0 { - Ok(u16::from_be_bytes(unsafe { *self.1.as_ptr().add(ptr).cast::<[u8; 2]>() })) + Ok(u16::from_be_bytes(unsafe { + *self.1.as_ptr().add(ptr).cast::<[u8; 2]>() + })) } else { unlikely_branch(); Err(OutOfBoundsError) @@ -418,7 +420,9 @@ impl Buffer { let end = ptr + 4; debug_assert!(end <= L); if end <= self.0 { - Ok(u32::from_be_bytes(unsafe { *self.1.as_ptr().add(ptr).cast::<[u8; 4]>() })) + Ok(u32::from_be_bytes(unsafe { + *self.1.as_ptr().add(ptr).cast::<[u8; 4]>() + })) } else { unlikely_branch(); Err(OutOfBoundsError) @@ -430,7 +434,9 @@ impl Buffer { let end = ptr + 8; debug_assert!(end <= L); if end <= self.0 { - Ok(u64::from_be_bytes(unsafe { *self.1.as_ptr().add(ptr).cast::<[u8; 8]>() })) + Ok(u64::from_be_bytes(unsafe { + *self.1.as_ptr().add(ptr).cast::<[u8; 8]>() + })) } else { unlikely_branch(); Err(OutOfBoundsError) @@ -499,7 +505,9 @@ impl Buffer { debug_assert!(end <= L); if end <= self.0 { *cursor = end; - Ok(u16::from_be_bytes(unsafe { *self.1.as_ptr().add(ptr).cast::<[u8; 2]>() })) + Ok(u16::from_be_bytes(unsafe { + *self.1.as_ptr().add(ptr).cast::<[u8; 2]>() + })) } else { unlikely_branch(); Err(OutOfBoundsError) @@ -513,7 +521,9 @@ impl Buffer { debug_assert!(end <= L); if end <= self.0 { *cursor = end; - Ok(u32::from_be_bytes(unsafe { *self.1.as_ptr().add(ptr).cast::<[u8; 4]>() })) + Ok(u32::from_be_bytes(unsafe { + *self.1.as_ptr().add(ptr).cast::<[u8; 4]>() + })) } else { unlikely_branch(); Err(OutOfBoundsError) @@ -527,7 +537,9 @@ impl Buffer { debug_assert!(end <= L); if end <= self.0 { *cursor = end; - Ok(u64::from_be_bytes(unsafe { *self.1.as_ptr().add(ptr).cast::<[u8; 8]>() })) + Ok(u64::from_be_bytes(unsafe { + *self.1.as_ptr().add(ptr).cast::<[u8; 8]>() + })) } else { unlikely_branch(); Err(OutOfBoundsError) diff --git a/src/inetaddress.rs b/src/inetaddress.rs index d1861b2..da4bbfe 100644 --- a/src/inetaddress.rs +++ b/src/inetaddress.rs @@ -596,13 +596,21 @@ impl InetAddress { } #[cfg(not(windows))] { - copy_nonoverlapping(ip2.as_ptr(), (&mut self.sin.sin_addr.s_addr as *mut u32).cast::(), 4); + copy_nonoverlapping( + ip2.as_ptr(), + (&mut self.sin.sin_addr.s_addr as *mut u32).cast::(), + 4, + ); } AF_INET } else if ip2.len() == 16 { self.sin6.sin6_family = AF_INET6.into(); self.sin6.sin6_port = port.into(); - copy_nonoverlapping(ip2.as_ptr(), (&mut self.sin6.sin6_addr as *mut in6_addr).cast::(), 16); + copy_nonoverlapping( + ip2.as_ptr(), + (&mut self.sin6.sin6_addr as *mut in6_addr).cast::(), + 16, + ); AF_INET6 } else { 0 @@ -637,11 +645,17 @@ impl InetAddress { AF_INET => { #[cfg(windows)] { - (*(self.sin.sin_addr.S_un.S_addr() as *const u32) as u128, self.sin.sin_port as u16) + ( + *(self.sin.sin_addr.S_un.S_addr() as *const u32) as u128, + self.sin.sin_port as u16, + ) } #[cfg(not(windows))] { - (*(&self.sin.sin_addr.s_addr as *const u32) as u128, self.sin.sin_port as u16) + ( + *(&self.sin.sin_addr.s_addr as *const u32) as u128, + self.sin.sin_port as u16, + ) } } AF_INET6 => ( @@ -897,10 +911,16 @@ impl ToFromBytes for InetAddress { r.read_exact(&mut b[..1])?; if b[0] == 4 { r.read_exact(&mut b[..6])?; - Ok(InetAddress::from_ip_port(&b[0..4], u16::from_be_bytes(b[4..6].try_into().unwrap()))) + Ok(InetAddress::from_ip_port( + &b[0..4], + u16::from_be_bytes(b[4..6].try_into().unwrap()), + )) } else if b[0] == 6 { r.read_exact(&mut b[..18])?; - Ok(InetAddress::from_ip_port(&b[0..16], u16::from_be_bytes(b[16..18].try_into().unwrap()))) + Ok(InetAddress::from_ip_port( + &b[0..16], + u16::from_be_bytes(b[16..18].try_into().unwrap()), + )) } else { return Ok(InetAddress::new()); } @@ -920,7 +940,11 @@ impl ToFromBytes for InetAddress { AF_INET6 => { let mut b = [0u8; 19]; b[0] = 6; - copy_nonoverlapping((&(self.sin6.sin6_addr) as *const in6_addr).cast::(), b.as_mut_ptr().offset(1), 16); + copy_nonoverlapping( + (&(self.sin6.sin6_addr) as *const in6_addr).cast::(), + b.as_mut_ptr().offset(1), + 16, + ); b[17] = *(&self.sin6.sin6_port as *const u16).cast::(); b[18] = *(&self.sin6.sin6_port as *const u16).cast::().offset(1); return w.write_all(&b); @@ -987,13 +1011,21 @@ impl FromStr for InetAddress { } #[cfg(not(windows))] { - copy_nonoverlapping(v4.octets().as_ptr(), (&mut (addr.sin.sin_addr.s_addr) as *mut u32).cast(), 4); + copy_nonoverlapping( + v4.octets().as_ptr(), + (&mut (addr.sin.sin_addr.s_addr) as *mut u32).cast(), + 4, + ); } } IpAddr::V6(v6) => { addr.sin6.sin6_family = AF_INET6.into(); addr.sin6.sin6_port = port.into(); - copy_nonoverlapping(v6.octets().as_ptr(), (&mut (addr.sin6.sin6_addr) as *mut in6_addr).cast(), 16); + copy_nonoverlapping( + v6.octets().as_ptr(), + (&mut (addr.sin6.sin6_addr) as *mut in6_addr).cast(), + 16, + ); } } } @@ -1011,11 +1043,16 @@ impl PartialEq for InetAddress { unsafe { if self.sa.sa_family == other.sa.sa_family { match self.sa.sa_family as AddressFamilyType { - AF_INET => self.sin.sin_port == other.sin.sin_port && get_s_addr(&self.sin) == get_s_addr(&other.sin), + AF_INET => { + self.sin.sin_port == other.sin.sin_port && get_s_addr(&self.sin) == get_s_addr(&other.sin) + } AF_INET6 => { if self.sin6.sin6_port == other.sin6.sin6_port { - (*(&(self.sin6.sin6_addr) as *const in6_addr).cast::<[u8; 16]>()) - .eq(&*(&(other.sin6.sin6_addr) as *const in6_addr).cast::<[u8; 16]>()) + (*(&(self.sin6.sin6_addr) as *const in6_addr).cast::<[u8; 16]>()).eq(&*(&(other + .sin6 + .sin6_addr) + as *const in6_addr) + .cast::<[u8; 16]>()) } else { false } @@ -1047,7 +1084,8 @@ impl Ord for InetAddress { match self.sa.sa_family as AddressFamilyType { 0 => Ordering::Equal, AF_INET => { - let ip_ordering = u32::from_be(get_s_addr(&self.sin)).cmp(&u32::from_be(get_s_addr(&other.sin))); + let ip_ordering = + u32::from_be(get_s_addr(&self.sin)).cmp(&u32::from_be(get_s_addr(&other.sin))); if ip_ordering == Ordering::Equal { u16::from_be(self.sin.sin_port).cmp(&u16::from_be(other.sin.sin_port)) } else { @@ -1066,8 +1104,9 @@ impl Ord for InetAddress { } _ => { // This shouldn't be possible, but handle it for correctness. - (*slice_from_raw_parts((self as *const Self).cast::(), size_of::())) - .cmp(&*slice_from_raw_parts((other as *const Self).cast::(), size_of::())) + (*slice_from_raw_parts((self as *const Self).cast::(), size_of::())).cmp( + &*slice_from_raw_parts((other as *const Self).cast::(), size_of::()), + ) } } } else { diff --git a/src/lib.rs b/src/lib.rs index eb9102f..99c68ce 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -31,7 +31,10 @@ pub const NEVER_HAPPENED_TICKS: i64 = i64::MIN / 2; /// Get milliseconds since unix epoch. #[inline] pub fn ms_since_epoch() -> i64 { - std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_millis() as i64 + std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap() + .as_millis() as i64 } /// Get an estimate of the number of CPU cores in the system.