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/sys_common | |
| 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/sys_common')
| -rw-r--r-- | src/libstd/sys_common/thread_info.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys_common/thread_local.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys_common/thread_info.rs b/src/libstd/sys_common/thread_info.rs index 2abb8afa828..7970042b1d6 100644 --- a/src/libstd/sys_common/thread_info.rs +++ b/src/libstd/sys_common/thread_info.rs @@ -45,7 +45,7 @@ pub fn stack_guard() -> Option<usize> { pub fn set(stack_guard: Option<usize>, thread: Thread) { THREAD_INFO.with(|c| assert!(c.borrow().is_none())); THREAD_INFO.with(move |c| *c.borrow_mut() = Some(ThreadInfo{ - stack_guard: stack_guard, - thread: thread, + stack_guard, + thread, })); } diff --git a/src/libstd/sys_common/thread_local.rs b/src/libstd/sys_common/thread_local.rs index 1f889c70707..87ffd304e1a 100644 --- a/src/libstd/sys_common/thread_local.rs +++ b/src/libstd/sys_common/thread_local.rs @@ -128,7 +128,7 @@ impl StaticKey { pub const fn new(dtor: Option<unsafe extern fn(*mut u8)>) -> StaticKey { StaticKey { key: atomic::AtomicUsize::new(0), - dtor: dtor + dtor, } } |
