Fix rebase noise

jasonbking · jasonbking · commit fd81ca3df27f · 2021-02-26T05:24:36.000Z
diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs
@@ -1,5 +1,3 @@
-#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
-use nix::ifaddrs::InterfaceAddress;
 use nix::sys::socket::{AddressFamily, InetAddr, UnixAddr, getsockname};
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]`
`2`		`-use nix::ifaddrs::InterfaceAddress;`
`3`	`1`	`use nix::sys::socket::{AddressFamily, InetAddr, UnixAddr, getsockname};`
`4`	`2`	`use std::collections::hash_map::DefaultHasher;`
`5`	`3`	`use std::hash::{Hash, Hasher};`