about summary refs log tree commit diff
path: root/src/libstd/sys/windows/ext/thread.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-30 12:42:44 +0000
committerbors <bors@rust-lang.org>2019-11-30 12:42:44 +0000
commitd8bdb3fdcbd88eb16e1a6669236122c41ed2aed3 (patch)
tree33974ee0e3d5976f284b056e03e6ef529d15e563 /src/libstd/sys/windows/ext/thread.rs
parent8f1bbd69e13c9e04a4c2b75612bc0c31af972439 (diff)
parentb14d9c21203ea79035bf4a8a8a68ad34658a265f (diff)
downloadrust-d8bdb3fdcbd88eb16e1a6669236122c41ed2aed3.tar.gz
rust-d8bdb3fdcbd88eb16e1a6669236122c41ed2aed3.zip
Auto merge of #66887 - dtolnay:rollup-uxowp8d, r=Centril
Rollup of 4 pull requests

Successful merges:

 - #66818 (Format libstd/os with rustfmt)
 - #66819 (Format libstd/sys with rustfmt)
 - #66820 (Format libstd with rustfmt)
 - #66847 (Allow any identifier as format arg name)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd/sys/windows/ext/thread.rs')
-rw-r--r--src/libstd/sys/windows/ext/thread.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/ext/thread.rs b/src/libstd/sys/windows/ext/thread.rs
index fdc7e7fa32f..41c29f5b950 100644
--- a/src/libstd/sys/windows/ext/thread.rs
+++ b/src/libstd/sys/windows/ext/thread.rs
@@ -2,9 +2,9 @@
 
 #![stable(feature = "thread_extensions", since = "1.9.0")]
 
-use crate::os::windows::io::{RawHandle, AsRawHandle, IntoRawHandle};
-use crate::thread;
+use crate::os::windows::io::{AsRawHandle, IntoRawHandle, RawHandle};
 use crate::sys_common::{AsInner, IntoInner};
+use crate::thread;
 
 #[stable(feature = "thread_extensions", since = "1.9.0")]
 impl<T> AsRawHandle for thread::JoinHandle<T> {
@@ -14,7 +14,7 @@ impl<T> AsRawHandle for thread::JoinHandle<T> {
 }
 
 #[stable(feature = "thread_extensions", since = "1.9.0")]
-impl<T> IntoRawHandle for thread::JoinHandle<T>  {
+impl<T> IntoRawHandle for thread::JoinHandle<T> {
     fn into_raw_handle(self) -> RawHandle {
         self.into_inner().into_handle().into_raw() as *mut _
     }