Fix the fallout of removing feature(import_shadowing).

This commit is contained in:
Eduard Burtescu
2014-12-15 06:03:00 +02:00
parent d5267d5845
commit 5193d542f6
20 changed files with 41 additions and 65 deletions

View File

@@ -20,7 +20,6 @@ use core::str;
use libc::{mod, uintptr_t};
use os;
use str::{FromStr, from_str, Str};
use sync::atomic;
/// Dynamically inquire about whether we're running under V.
@@ -66,7 +65,7 @@ pub fn min_stack() -> uint {
pub fn default_sched_threads() -> uint {
match os::getenv("RUST_THREADS") {
Some(nstr) => {
let opt_n: Option<uint> = FromStr::from_str(nstr.as_slice());
let opt_n: Option<uint> = from_str(nstr.as_slice());
match opt_n {
Some(n) if n > 0 => n,
_ => panic!("`RUST_THREADS` is `{}`, should be a positive integer", nstr)