Upgrade to windows-sys 0.60

Author: djc

Cargo.lock

@@ -125,7 +125,7 @@ features = [
   "Win32_UI",
   "Win32_UI_WindowsAndMessaging",
 ]
-version = "0.59"
+version = "0.60"
 
 [dev-dependencies]
 enum-map = "2.5.0"

Cargo.toml

@@ -7,7 +7,7 @@ use std::{
 
 use anyhow::{Context, Result};
 
-use crate::errors::*;
+use crate::errors::RustupError;
 
 #[tracing::instrument(level = "trace", err(level = "trace"))]
 pub(crate) fn run_command_for_dir<S: AsRef<OsStr> + Debug>(
@@ -35,8 +35,9 @@ pub(crate) fn run_command_for_dir<S: AsRef<OsStr> + Debug>(
 
     #[cfg(windows)]
     fn exec(cmd: &mut Command) -> io::Result<ExitStatus> {
-        use windows_sys::Win32::Foundation::{BOOL, FALSE, TRUE};
+        use windows_sys::Win32::Foundation::{FALSE, TRUE};
         use windows_sys::Win32::System::Console::SetConsoleCtrlHandler;
+        use windows_sys::core::BOOL;
 
         unsafe extern "system" fn ctrlc_handler(_: u32) -> BOOL {
             // Do nothing. Let the child process handle it.

src/command.rs

@@ -422,10 +422,10 @@ impl TargetTriple {
             /// it is only available on Windows 10 1511+, so we use `GetProcAddress`
             /// to maintain backward compatibility with older Windows versions.
             fn arch_primary() -> Option<&'static str> {
-                use windows_sys::Win32::Foundation::{BOOL, HANDLE};
+                use windows_sys::Win32::Foundation::HANDLE;
                 use windows_sys::Win32::System::LibraryLoader::{GetModuleHandleA, GetProcAddress};
                 use windows_sys::Win32::System::Threading::GetCurrentProcess;
-                use windows_sys::core::s;
+                use windows_sys::core::{BOOL, s};
 
                 const IMAGE_FILE_MACHINE_ARM64: u16 = 0xAA64;
                 const IMAGE_FILE_MACHINE_AMD64: u16 = 0x8664;