Replace get_stdout_handle() with io::stdout().as_raw_handle().

Author: de-vri-es

library/test/src/term/win.rs

@@ -4,6 +4,7 @@
 
 use std::io;
 use std::io::prelude::*;
+use std::os::windows::{io::AsRawHandle, raw::HANDLE};
 
 use super::color;
 use super::Terminal;
@@ -21,7 +22,6 @@ type SHORT = i16;
 type WORD = u16;
 type DWORD = u32;
 type BOOL = i32;
-type HANDLE = *mut u8;
 
 #[allow(non_snake_case)]
 #[repr(C)]
@@ -54,7 +54,6 @@ struct CONSOLE_SCREEN_BUFFER_INFO {
 extern "system" {
     fn SetConsoleTextAttribute(handle: HANDLE, attr: WORD) -> BOOL;
     fn GetConsoleMode(handle: HANDLE, mode: *mut DWORD) -> BOOL;
-    fn GetStdHandle(which: DWORD) -> HANDLE;
     fn GetConsoleScreenBufferInfo(handle: HANDLE, info: *mut CONSOLE_SCREEN_BUFFER_INFO) -> BOOL;
 }
 
@@ -92,29 +91,14 @@ fn bits_to_color(bits: u16) -> color::Color {
     color | (u32::from(bits) & 0x8) // copy the hi-intensity bit
 }
 
-fn get_stdout_handle() -> HANDLE {
-    unsafe {
-        // Magic -11 means stdout, from
-        // https://docs.microsoft.com/en-us/windows/console/getstdhandle
-        //
-        // You may be wondering, "but what about stderr?", and the answer
-        // to that is that setting terminal attributes on the stdout
-        // handle also sets them for stderr, since they go to the same
-        // terminal! Admittedly, this is fragile, since stderr could be
-        // redirected to a different console. This is good enough for
-        // rustc though. See #13400.
-        GetStdHandle(-11i32 as DWORD)
-    }
-}
-
 impl<T: Write + Send + 'static> WinConsole<T> {
     fn apply(&mut self) {
         let _unused = self.buf.flush();
         let mut accum: WORD = 0;
         accum |= color_to_bits(self.foreground);
         accum |= color_to_bits(self.background) << 4;
 
-        let out = get_stdout_handle();
+        let out = std::io::stdout().as_raw_handle();
         unsafe {
             SetConsoleTextAttribute(out, accum);
         }
@@ -126,11 +110,10 @@ impl<T: Write + Send + 'static> WinConsole<T> {
 
         let fg;
         let bg;
+        let stdout = std::io::stdout().as_raw_handle();
         unsafe {
             let mut buffer_info = MaybeUninit::<CONSOLE_SCREEN_BUFFER_INFO>::uninit();
-            if GetConsoleScreenBufferInfo(GetStdHandle(-11i32 as DWORD), buffer_info.as_mut_ptr())
-                != 0
-            {
+            if GetConsoleScreenBufferInfo(stdout, buffer_info.as_mut_ptr()) != 0 {
                 let buffer_info = buffer_info.assume_init();
                 fg = bits_to_color(buffer_info.wAttributes);
                 bg = bits_to_color(buffer_info.wAttributes >> 4);
@@ -171,7 +154,7 @@ impl<T: Write + Send + 'static> Terminal for WinConsole<T> {
         // From https://docs.microsoft.com/en-us/windows/console/getconsolemode
         const ENABLE_VIRTUAL_TERMINAL_PROCESSING: DWORD = 0x0004;
 
-        let stdout = get_stdout_handle();
+        let stdout = std::io::stdout().as_raw_handle();
         let mut mode: DWORD = 0;
         unsafe {
             if GetConsoleMode(stdout, &mut mode) != 0 {