From 81e95c18b7d4c45c7ef41b231af4ecd40543567d Mon Sep 17 00:00:00 2001 From: Tobias Bucher Date: Fri, 24 Jun 2016 20:54:52 +0200 Subject: Use `ptr::{null, null_mut}` instead of `0 as *{const, mut}` --- src/libtest/lib.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/libtest') 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 { -- cgit 1.4.1-3-g733a5