about summary refs log tree commit diff
path: root/src/libstd/sync/mpsc/blocking.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/sync/mpsc/blocking.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/sync/mpsc/blocking.rs')
-rw-r--r--src/libstd/sync/mpsc/blocking.rs17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/libstd/sync/mpsc/blocking.rs b/src/libstd/sync/mpsc/blocking.rs
index 6eacfaec253..d34de6a4fac 100644
--- a/src/libstd/sync/mpsc/blocking.rs
+++ b/src/libstd/sync/mpsc/blocking.rs
@@ -1,9 +1,9 @@
 //! Generic support for building blocking abstractions.
 
-use crate::thread::{self, Thread};
+use crate::mem;
 use crate::sync::atomic::{AtomicBool, Ordering};
 use crate::sync::Arc;
-use crate::mem;
+use crate::thread::{self, Thread};
 use crate::time::Instant;
 
 struct Inner {
@@ -28,16 +28,9 @@ impl !Send for WaitToken {}
 impl !Sync for WaitToken {}
 
 pub fn tokens() -> (WaitToken, SignalToken) {
-    let inner = Arc::new(Inner {
-        thread: thread::current(),
-        woken: AtomicBool::new(false),
-    });
-    let wait_token = WaitToken {
-        inner: inner.clone(),
-    };
-    let signal_token = SignalToken {
-        inner,
-    };
+    let inner = Arc::new(Inner { thread: thread::current(), woken: AtomicBool::new(false) });
+    let wait_token = WaitToken { inner: inner.clone() };
+    let signal_token = SignalToken { inner };
     (wait_token, signal_token)
 }