diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:18:07 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:18:07 -0800 |
| commit | 907db6c8344a4df070ee2b21479062a63c3ae2be (patch) | |
| tree | b4950d1359d2d30a866039946cf4ff96ba8d6019 /src/libstd/thread_local | |
| parent | b5de8333b3ef29fe3d0952d9207fd275c45da9f2 (diff) | |
| parent | 2c2480df5d340f4c7b2deeef0177e4fd22f2b03a (diff) | |
| download | rust-907db6c8344a4df070ee2b21479062a63c3ae2be.tar.gz rust-907db6c8344a4df070ee2b21479062a63c3ae2be.zip | |
rollup merge of #21444: petrochenkov/null
Conflicts: src/libstd/sync/mpsc/select.rs
Diffstat (limited to 'src/libstd/thread_local')
| -rw-r--r-- | src/libstd/thread_local/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index 4c99cff34da..24e46d8d88e 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -425,7 +425,7 @@ mod imp { dtor(ptr); } ptr = DTORS.get(); - DTORS.set(0 as *mut _); + DTORS.set(ptr::null_mut()); } } } @@ -522,7 +522,7 @@ mod imp { let key = ptr.key; key.os.set(1 as *mut u8); drop(ptr); - key.os.set(0 as *mut u8); + key.os.set(ptr::null_mut()); } } |