build: expand windows version range to include 0.59

Author: ErichDonGubler

Cargo.toml

@@ -27,7 +27,7 @@ static_assertions = { version = "1.1", default-features = false }
 
 [target.'cfg(windows)'.dependencies]
 # Don't increase beyond what Firefox is currently using: https://searchfox.org/mozilla-central/source/Cargo.lock
-windows = { version = "0.58", features = [
+windows = { version = ">=0.58,<0.60", features = [
   "Win32_Foundation",
   "Win32_NetworkManagement_IpHelper",
   "Win32_NetworkManagement_Ndis",

src/windows.rs

@@ -11,23 +11,23 @@ use std::{
     ptr, slice,
 };
 
-use crate::default_err;
-
-use windows::{
-    Win32::Foundation::NO_ERROR,
-    Win32::NetworkManagement::{
+use windows::Win32::{
+    Foundation::NO_ERROR,
+    NetworkManagement::{
         IpHelper::{
             if_indextoname, FreeMibTable, GetBestInterfaceEx, GetIpInterfaceTable,
             MIB_IPINTERFACE_ROW, MIB_IPINTERFACE_TABLE,
         },
         Ndis::IF_MAX_STRING_SIZE,
     },
-    Win32::Networking::WinSock::{
+    Networking::WinSock::{
         AF_INET, AF_INET6, IN6_ADDR, IN6_ADDR_0, IN_ADDR, IN_ADDR_0, SOCKADDR, SOCKADDR_IN,
         SOCKADDR_IN6, SOCKADDR_INET,
     },
 };
 
+use crate::default_err;
+
 struct MibTablePtr(*mut MIB_IPINTERFACE_TABLE);
 
 impl MibTablePtr {