diff options
| author | Tobias Bucher <tobiasbucher5991@gmail.com> | 2016-06-24 20:54:52 +0200 |
|---|---|---|
| committer | Tobias Bucher <tobiasbucher5991@gmail.com> | 2016-07-12 10:40:40 +0200 |
| commit | 81e95c18b7d4c45c7ef41b231af4ecd40543567d (patch) | |
| tree | ced85ac151c5d6c0a892fc063906a232b3b49ea3 /src/libtest | |
| parent | 2539c15b49530e882a3e8803b3f53a7914d367be (diff) | |
| download | rust-81e95c18b7d4c45c7ef41b231af4ecd40543567d.tar.gz rust-81e95c18b7d4c45c7ef41b231af4ecd40543567d.zip | |
Use `ptr::{null, null_mut}` instead of `0 as *{const, mut}`
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index c90c93e75ac..248f6f98650 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -959,6 +959,8 @@ fn get_concurrency() -> usize { target_os = "bitrig", target_os = "netbsd"))] fn num_cpus() -> usize { + use std::ptr; + let mut cpus: libc::c_uint = 0; let mut cpus_size = std::mem::size_of_val(&cpus); @@ -972,7 +974,7 @@ fn get_concurrency() -> usize { 2, &mut cpus as *mut _ as *mut _, &mut cpus_size as *mut _ as *mut _, - 0 as *mut _, + ptr::null_mut(), 0); } if cpus < 1 { @@ -984,6 +986,8 @@ fn get_concurrency() -> usize { #[cfg(target_os = "openbsd")] fn num_cpus() -> usize { + use std::ptr; + let mut cpus: libc::c_uint = 0; let mut cpus_size = std::mem::size_of_val(&cpus); let mut mib = [libc::CTL_HW, libc::HW_NCPU, 0, 0]; @@ -993,7 +997,7 @@ fn get_concurrency() -> usize { 2, &mut cpus as *mut _ as *mut _, &mut cpus_size as *mut _ as *mut _, - 0 as *mut _, + ptr::null_mut(), 0); } if cpus < 1 { |