From 9874129df595a1652cb20cfe4993dd5ff4bd17c9 Mon Sep 17 00:00:00 2001
From: Maia <66437537+maia-s@users.noreply.github.com>
Date: Sat, 13 Jan 2024 14:14:20 +0100
Subject: [PATCH] fix compile on stable

---
 hash-t/src/impls.rs | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/hash-t/src/impls.rs b/hash-t/src/impls.rs
index 911bfd2..005453f 100644
--- a/hash-t/src/impls.rs
+++ b/hash-t/src/impls.rs
@@ -243,7 +243,6 @@ mod core_impls {
         fmt::Error,
         marker::{PhantomData, PhantomPinned},
         mem::{discriminant, transmute, Discriminant, ManuallyDrop},
-        net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
         num::{
             NonZeroI128, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI8, NonZeroIsize, NonZeroU128,
             NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU8, NonZeroUsize, Saturating, Wrapping,
@@ -290,30 +289,6 @@ mod core_impls {
         }
     }
 
-    impl_hash_t!(SocketAddrV4; SocketAddrV6);
-
-    impl<T> Hash<T> for IpAddr {
-        #[inline]
-        fn hash<H: Hasher<T>>(&self, state: &mut H) {
-            discriminant(self).hash(state);
-            match self {
-                IpAddr::V4(v4) => v4.hash(state),
-                IpAddr::V6(v6) => v6.hash(state),
-            }
-        }
-    }
-
-    impl<T> Hash<T> for SocketAddr {
-        #[inline]
-        fn hash<H: Hasher<T>>(&self, state: &mut H) {
-            discriminant(self).hash(state);
-            match self {
-                SocketAddr::V4(v4) => v4.hash(state),
-                SocketAddr::V6(v6) => v6.hash(state),
-            }
-        }
-    }
-
     impl<T, I: Hash<T>> Hash<T> for Range<I> {
         #[inline]
         fn hash<H: Hasher<T>>(&self, state: &mut H) {
@@ -415,9 +390,6 @@ mod core_impls {
             NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU128, NonZeroUsize,
             NonZeroI8, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI128, NonZeroIsize,
         }
-        octets {
-            Ipv4Addr, Ipv6Addr,
-        }
         to_bytes_with_nul {
             CStr,
         }
@@ -545,6 +517,7 @@ mod std_impls {
     use std::{
         ffi::{OsStr, OsString},
         fs::FileType,
+        net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
         path::{Component, Path, PathBuf, Prefix, PrefixComponent},
         thread::ThreadId,
         time::{Instant, SystemTime},
@@ -562,6 +535,12 @@ mod std_impls {
         ThreadId;
         Instant;
         SystemTime;
+        SocketAddr;
+        SocketAddrV4;
+        SocketAddrV6;
+        IpAddr;
+        Ipv4Addr;
+        Ipv6Addr;
     );
 }