rollup merge of #18536 : bjz/strconv

This commit is contained in:
Alex Crichton 2014-11-03 15:29:35 -08:00
commit ee5d238389
8 changed files with 280 additions and 549 deletions

View file

@ -24,7 +24,6 @@ extern crate time;
use std::os;
use std::result::{Ok, Err};
use std::task;
use std::uint;
fn fib(n: int) -> int {
fn pfib(tx: &Sender<int>, n: int) {
@ -102,8 +101,7 @@ fn main() {
if opts.stress {
stress(2);
} else {
let max = uint::parse_bytes(args[1].as_bytes(), 10u).unwrap() as
int;
let max = from_str::<uint>(args[1].as_slice()).unwrap() as int;
let num_trials = 10;