Auto merge of #30525 - semarie:ncpu, r=alexcrichton

Should unbreak build (well, remove one reason to break) for *bsd target.

r? @alexcrichton

Author: bors

src/libtest/lib.rs

@@ -923,21 +923,21 @@ fn get_concurrency() -> usize {
               target_os = "netbsd"))]
     fn num_cpus() -> usize {
         let mut cpus: libc::c_uint = 0;
-        let mut CPUS_SIZE = std::mem::size_of_val(&cpus);
+        let mut cpus_size = std::mem::size_of_val(&cpus);
         let mut mib = [libc::CTL_HW, libc::HW_AVAILCPU, 0, 0];
 
         unsafe {
             libc::sysctl(mib.as_mut_ptr(), 2,
                          &mut cpus as *mut _ as *mut _,
-                         &mut CPUS_SIZE as *mut _ as *mut _,
+                         &mut cpus_size as *mut _ as *mut _,
                          0 as *mut _, 0);
         }
         if cpus < 1 {
-            mib[1] = HW_NCPU;
+            mib[1] = libc::HW_NCPU;
             unsafe {
                 libc::sysctl(mib.as_mut_ptr(), 2,
                              &mut cpus as *mut _ as *mut _,
-                             &mut CPUS_SIZE as *mut _ as *mut _,
+                             &mut cpus_size as *mut _ as *mut _,
                              0 as *mut _, 0);
             }
             if cpus < 1 {