diff options
| author | bors <bors@rust-lang.org> | 2016-02-24 22:58:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-24 22:58:28 +0000 |
| commit | f6f050d09003a4c7895f44fed3a7c6cdce8f2949 (patch) | |
| tree | b86509358be85838e2c677348bb476a981327f6b /src/libstd/sys | |
| parent | 0ef8d426050318934d16d962325ec002eaf0c29d (diff) | |
| parent | b660ca59ff16bc4bfb675fa6afe61b32aa284d96 (diff) | |
| download | rust-f6f050d09003a4c7895f44fed3a7c6cdce8f2949.tar.gz rust-f6f050d09003a4c7895f44fed3a7c6cdce8f2949.zip | |
Auto merge of #31873 - Manishearth:rollup, r=Manishearth
- Successful merges: #31677, #31784, #31839, #31842, #31843, #31850, #31863, #31868, #31870 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index 6a5c38ed9d0..59da74b7287 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -69,9 +69,8 @@ static mut DTORS: *mut Vec<(Key, Dtor)> = ptr::null_mut(); pub unsafe fn create(dtor: Option<Dtor>) -> Key { let key = c::TlsAlloc(); assert!(key != c::TLS_OUT_OF_INDEXES); - match dtor { - Some(f) => register_dtor(key, f), - None => {} + if let Some(f) = dtor { + register_dtor(key, f); } return key; } |