about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2016-07-15 10:56:42 +0200
committerGitHub <noreply@github.com>2016-07-15 10:56:42 +0200
commit6f07b6ca4b064ea8e6d172fc7d6a87f065c20327 (patch)
treea7074be9c51f116a7cbf18b67d1387e9207fb3f4 /src/libstd/sync
parentb6c1ef3745f707a0f76f17dc2b313b831ee1bfb0 (diff)
parent81e95c18b7d4c45c7ef41b231af4ecd40543567d (diff)
downloadrust-6f07b6ca4b064ea8e6d172fc7d6a87f065c20327.tar.gz
rust-6f07b6ca4b064ea8e6d172fc7d6a87f065c20327.zip
Rollup merge of #34456 - tbu-:pr_ptr_null, r=aturon
Use `ptr::{null, null_mut}` instead of `0 as *{const, mut}`
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/once.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs
index e9ea465cc99..54c1fe6c564 100644
--- a/src/libstd/sync/once.rs
+++ b/src/libstd/sync/once.rs
@@ -65,6 +65,7 @@
 // it!
 
 use marker;
+use ptr;
 use sync::atomic::{AtomicUsize, AtomicBool, Ordering};
 use thread::{self, Thread};
 
@@ -297,7 +298,7 @@ impl Once {
                     let mut node = Waiter {
                         thread: Some(thread::current()),
                         signaled: AtomicBool::new(false),
-                        next: 0 as *mut Waiter,
+                        next: ptr::null_mut(),
                     };
                     let me = &mut node as *mut Waiter as usize;
                     assert!(me & STATE_MASK == 0);