refactor(download): use NonZero instead of NonZeroU64

Author: rami3l

src/download/mod.rs

@@ -1,7 +1,7 @@
 //! Easy file downloading
 
 use std::fs::remove_file;
-use std::num::NonZeroU64;
+use std::num::NonZero;
 use std::path::Path;
 use std::str::FromStr;
 use std::time::Duration;
@@ -201,9 +201,11 @@ async fn download_file_(
     };
 
     let timeout = Duration::from_secs(match process.var("RUSTUP_DOWNLOAD_TIMEOUT") {
-        Ok(s) => NonZeroU64::from_str(&s).context(
-            "invalid value in RUSTUP_DOWNLOAD_TIMEOUT -- must be a natural number greater than zero",
-        )?.get(),
+        Ok(s) => NonZero::from_str(&s)
+            .context(
+                "invalid value in RUSTUP_DOWNLOAD_TIMEOUT -- must be a natural number greater than zero",
+            )?
+            .get(),
         Err(_) => 180,
     });
 

src/process.rs

@@ -2,7 +2,7 @@ use std::ffi::OsString;
 use std::fmt::Debug;
 use std::io;
 use std::io::IsTerminal;
-use std::num::NonZeroU64;
+use std::num::NonZero;
 use std::path::PathBuf;
 use std::str::FromStr;
 #[cfg(feature = "test")]
@@ -189,7 +189,7 @@ impl Process {
 
     pub fn concurrent_downloads(&self) -> Option<usize> {
         let s = self.var("RUSTUP_CONCURRENT_DOWNLOADS").ok()?;
-        Some(NonZeroU64::from_str(&s).ok()?.get() as usize)
+        Some(NonZero::from_str(&s).ok()?.get())
     }
 }