diff options
| author | bors <bors@rust-lang.org> | 2017-08-16 04:00:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-16 04:00:24 +0000 |
| commit | 6f4ab9458a7ad06c8ce630604f533c8c0c0acef4 (patch) | |
| tree | 8b1076cf97b6482b624b3655e078a4530a460cb3 /src/libstd/sync | |
| parent | e40dc66f47614eb2d1c8026d112a27b6f8b291d0 (diff) | |
| parent | 1b6c9605e41b7c7dc23e0e6f633f05912d0463dd (diff) | |
| download | rust-6f4ab9458a7ad06c8ce630604f533c8c0c0acef4.tar.gz rust-6f4ab9458a7ad06c8ce630604f533c8c0c0acef4.zip | |
Auto merge of #43710 - zackmdavis:field_init_shorthand_power_slam, r=Mark-Simulacrum
use field init shorthand EVERYWHERE Like #43008 (f668999), but [(lacking reasons to be more timid)](https://github.com/rust-lang/rust/pull/43008#issuecomment-312463564) _much more aggressive_. r? @Mark-Simulacrum
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mpsc/blocking.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/select.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/sync.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sync/mpsc/blocking.rs b/src/libstd/sync/mpsc/blocking.rs index 0f9ef6fabb0..c08bd6d133d 100644 --- a/src/libstd/sync/mpsc/blocking.rs +++ b/src/libstd/sync/mpsc/blocking.rs @@ -46,7 +46,7 @@ pub fn tokens() -> (WaitToken, SignalToken) { inner: inner.clone(), }; let signal_token = SignalToken { - inner: inner + inner, }; (wait_token, signal_token) } diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index 8b4da532af6..e49f4cff024 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -148,12 +148,12 @@ impl Select { let id = self.next_id.get(); self.next_id.set(id + 1); Handle { - id: id, + id, selector: self.inner.get(), next: ptr::null_mut(), prev: ptr::null_mut(), added: false, - rx: rx, + rx, packet: rx, } } diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index 1d16e002a2b..90f12c826d6 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.rs @@ -177,7 +177,7 @@ impl<T> Packet<T> { lock: Mutex::new(State { disconnected: false, blocker: NoneBlocked, - cap: cap, + cap, canceled: None, queue: Queue { head: ptr::null_mut(), |
