From 0439162d597d4abfebf93096e71ff45242efe6f0 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaric@linux.com>
Date: Mon, 16 Jun 2014 15:36:07 -0500
Subject: Move `num_cpus` from `std::rt::util` to `std::os`. Closes #14707

---
 src/libstd/rt/util.rs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/libstd/rt')

diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs
index 670d4aa2061..fa30ddbcc48 100644
--- a/src/libstd/rt/util.rs
+++ b/src/libstd/rt/util.rs
@@ -11,23 +11,11 @@
 use from_str::FromStr;
 use from_str::from_str;
 use libc::uintptr_t;
-use libc;
 use option::{Some, None, Option};
 use os;
 use str::Str;
 use sync::atomics;
 
-/// Get the number of cores available
-pub fn num_cpus() -> uint {
-    unsafe {
-        return rust_get_num_cpus();
-    }
-
-    extern {
-        fn rust_get_num_cpus() -> libc::uintptr_t;
-    }
-}
-
 /// Dynamically inquire about whether we're running under V.
 /// You should usually not use this unless your test definitely
 /// can't run correctly un-altered. Valgrind is there to help
@@ -81,7 +69,7 @@ pub fn default_sched_threads() -> uint {
             if limit_thread_creation_due_to_osx_and_valgrind() {
                 1
             } else {
-                num_cpus()
+                os::num_cpus()
             }
         }
     }
-- 
cgit 1.4.1-3-g733a5