diff options
| author | bors <bors@rust-lang.org> | 2013-06-26 00:56:04 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-26 00:56:04 -0700 |
| commit | 09b4525f84ea878962f26bcd22d208b9d87d5560 (patch) | |
| tree | 070e713e20e7bda8237002123c3dc561e8b8ccbf /src/libstd/rt | |
| parent | ebed4d00d01753d25fba087c6b5edcbc1406f306 (diff) | |
| parent | c109bed15b79c81fed4277abd0f4a71a221224c1 (diff) | |
| download | rust-09b4525f84ea878962f26bcd22d208b9d87d5560.tar.gz rust-09b4525f84ea878962f26bcd22d208b9d87d5560.zip | |
auto merge of #7113 : alexcrichton/rust/banned-warnings, r=cmr
Reopening of #7031, Closes #6963 I imagine though that this will bounce in bors once or twice... Because attributes can't be cfg(stage0)'d off, there's temporarily a lot of new stage0/stage1+ code.
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/thread_local_storage.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/thread_local_storage.rs b/src/libstd/rt/thread_local_storage.rs index 7187d2db41c..5041b559ecb 100644 --- a/src/libstd/rt/thread_local_storage.rs +++ b/src/libstd/rt/thread_local_storage.rs @@ -60,13 +60,13 @@ pub type Key = DWORD; #[cfg(windows)] pub unsafe fn create(key: &mut Key) { static TLS_OUT_OF_INDEXES: DWORD = 0xFFFFFFFF; - *key = unsafe { TlsAlloc() }; + *key = TlsAlloc(); assert!(*key != TLS_OUT_OF_INDEXES); } #[cfg(windows)] pub unsafe fn set(key: Key, value: *mut c_void) { - unsafe { assert!(0 != TlsSetValue(key, value)) } + assert!(0 != TlsSetValue(key, value)) } #[cfg(windows)] |