Incorporated range operator and collapsible_match

src/connect.rs

@@ -1005,7 +1005,7 @@ mod verbose {
                 } else if c == b'\0' {
                     write!(f, "\\0")?;
                 // ASCII printable
-                } else if c >= 0x20 && c < 0x7f {
+                } else if (0x20..0x7f).contains(&c) {
                     write!(f, "{}", c as char)?;
                 } else {
                     write!(f, "\\x{:02x}", c)?;

src/proxy.rs

@@ -279,11 +279,8 @@ impl Proxy {
             // Custom *may* match 'http', so assume so.
             | Intercept::Custom(_) => true,
             Intercept::System(ref system) => {
-                if let Some(proxy) = system.get("http") {
-                    match proxy {
-                        ProxyScheme::Http { auth, .. } => auth.is_some(),
-                        _ => false,
-                    }
+                if let Some(ProxyScheme::Http { auth, .. }) = system.get("http") {
+                    auth.is_some()
                 } else {
                     false
                 }
@@ -732,19 +729,18 @@ fn get_sys_proxies(
         RegistryProxyValues,
     >,
 ) -> SystemProxyMap {
-    let proxies = get_from_environment();
-
     // TODO: move the following #[cfg] to `if expression` when attributes on `if` expressions allowed
     #[cfg(target_os = "windows")]
     {
+        let proxies = get_from_environment();
         if proxies.is_empty() {
             // don't care errors if can't get proxies from registry, just return an empty HashMap.
             if let Some(registry_values) = registry_values {
                 return parse_registry_values(registry_values);
             }
         }
     }
-    proxies
+    get_from_environment()
 }
 
 fn insert_proxy(proxies: &mut SystemProxyMap, scheme: impl Into<String>, addr: String) -> bool {