diff options
Diffstat (limited to 'src/test')
32 files changed, 53 insertions, 65 deletions
diff --git a/src/test/bench/core-map.rs b/src/test/bench/core-map.rs index da1c3596ff6..cf160ca31c6 100644 --- a/src/test/bench/core-map.rs +++ b/src/test/bench/core-map.rs @@ -100,7 +100,7 @@ fn main() { let args = os::args(); let n_keys = { if args.len() == 2 { - uint::from_str(args[1]).get() + uint::from_str(args[1]).unwrap() } else { 1000000 } diff --git a/src/test/bench/core-set.rs b/src/test/bench/core-set.rs index 2c412e2eecd..4fbe00622aa 100644 --- a/src/test/bench/core-set.rs +++ b/src/test/bench/core-set.rs @@ -159,7 +159,7 @@ fn main() { let args = os::args(); let num_keys = { if args.len() == 2 { - uint::from_str(args[1]).get() + uint::from_str(args[1]).unwrap() } else { 100 // woefully inadequate for any real measurement } diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/core-uint-to-str.rs index 8924a9beb6e..4a32fda59d8 100644 --- a/src/test/bench/core-uint-to-str.rs +++ b/src/test/bench/core-uint-to-str.rs @@ -21,7 +21,7 @@ fn main() { args }; - let n = uint::from_str(args[1]).get(); + let n = uint::from_str(args[1]).unwrap(); for i in range(0u, n) { let x = uint::to_str(i); diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs index 2557680f7b5..2f4d763b84d 100644 --- a/src/test/bench/graph500-bfs.rs +++ b/src/test/bench/graph500-bfs.rs @@ -418,8 +418,8 @@ fn main() { args }; - let scale = uint::from_str(args[1]).get(); - let num_keys = uint::from_str(args[2]).get(); + let scale = uint::from_str(args[1]).unwrap(); + let num_keys = uint::from_str(args[2]).unwrap(); let do_validate = false; let do_sequential = true; diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index 186923da43b..4e9656afb81 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -59,8 +59,8 @@ fn run(args: &[~str]) { let to_child = SharedChan::new(to_child); - let size = uint::from_str(args[1]).get(); - let workers = uint::from_str(args[2]).get(); + let size = uint::from_str(args[1]).unwrap(); + let workers = uint::from_str(args[2]).unwrap(); let num_bytes = 100; let start = extra::time::precise_time_s(); let mut worker_results = ~[]; diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index 05ace5fd8e6..470e23d63a5 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -53,8 +53,8 @@ fn run(args: &[~str]) { let (from_parent, to_child) = stream(); let to_child = SharedChan::new(to_child); - let size = uint::from_str(args[1]).get(); - let workers = uint::from_str(args[2]).get(); + let size = uint::from_str(args[1]).unwrap(); + let workers = uint::from_str(args[2]).unwrap(); let num_bytes = 100; let start = extra::time::precise_time_s(); let mut worker_results = ~[]; diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs index 649d029e60e..7de95f4d822 100644 --- a/src/test/bench/msgsend-ring-mutex-arcs.rs +++ b/src/test/bench/msgsend-ring-mutex-arcs.rs @@ -79,8 +79,8 @@ fn main() { args.clone() }; - let num_tasks = uint::from_str(args[1]).get(); - let msg_per_task = uint::from_str(args[2]).get(); + let num_tasks = uint::from_str(args[1]).unwrap(); + let msg_per_task = uint::from_str(args[2]).unwrap(); let (num_chan, num_port) = init(); let num_chan = Cell::new(num_chan); diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs index 7f9d7aa5889..1299e863db6 100644 --- a/src/test/bench/msgsend-ring-rw-arcs.rs +++ b/src/test/bench/msgsend-ring-rw-arcs.rs @@ -75,8 +75,8 @@ fn main() { args.clone() }; - let num_tasks = uint::from_str(args[1]).get(); - let msg_per_task = uint::from_str(args[2]).get(); + let num_tasks = uint::from_str(args[1]).unwrap(); + let msg_per_task = uint::from_str(args[2]).unwrap(); let (num_chan, num_port) = init(); let num_chan = Cell::new(num_chan); diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout-ackermann.rs index e06ff02a0b3..e8659ba26d4 100644 --- a/src/test/bench/shootout-ackermann.rs +++ b/src/test/bench/shootout-ackermann.rs @@ -35,6 +35,6 @@ fn main() { } else { args }; - let n = int::from_str(args[1]).get(); + let n = int::from_str(args[1]).unwrap(); printfln!("Ack(3,%d): %d\n", n, ack(3, n)); } diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs index 57bf33fb2fd..8a2ae3e8995 100644 --- a/src/test/bench/shootout-binarytrees.rs +++ b/src/test/bench/shootout-binarytrees.rs @@ -48,7 +48,7 @@ fn main() { args }; - let n = int::from_str(args[1]).get(); + let n = int::from_str(args[1]).unwrap(); let min_depth = 4; let mut max_depth; if min_depth + 2 > n { diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs index f48c1532946..190ad62d6e1 100644 --- a/src/test/bench/shootout-chameneos-redux.rs +++ b/src/test/bench/shootout-chameneos-redux.rs @@ -212,7 +212,7 @@ fn main() { args }; - let nn = uint::from_str(args[1]).get(); + let nn = uint::from_str(args[1]).unwrap(); print_complements(); io::println(""); diff --git a/src/test/bench/shootout-fannkuch-redux.rs b/src/test/bench/shootout-fannkuch-redux.rs index bf942cf61a3..9d4d31b8969 100644 --- a/src/test/bench/shootout-fannkuch-redux.rs +++ b/src/test/bench/shootout-fannkuch-redux.rs @@ -91,6 +91,6 @@ fn fannkuch_redux(n: i32) -> i32 { #[fixed_stack_segment] fn main() { - let n: i32 = FromStr::from_str(os::args()[1]).get(); + let n: i32 = FromStr::from_str(os::args()[1]).unwrap(); printfln!("Pfannkuchen(%d) = %d", n as int, fannkuch_redux(n) as int); } diff --git a/src/test/bench/shootout-fasta-redux.rs b/src/test/bench/shootout-fasta-redux.rs index af96170c79c..579b88a7e0e 100644 --- a/src/test/bench/shootout-fasta-redux.rs +++ b/src/test/bench/shootout-fasta-redux.rs @@ -184,7 +184,7 @@ impl RandomFasta { #[fixed_stack_segment] fn main() { - let n: uint = FromStr::from_str(os::args()[1]).get(); + let n: uint = FromStr::from_str(os::args()[1]).unwrap(); unsafe { let mode = "w"; diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs index 3a90c6647e0..4e2ab8b0a49 100644 --- a/src/test/bench/shootout-fasta.rs +++ b/src/test/bench/shootout-fasta.rs @@ -130,7 +130,7 @@ fn main() { io::stdout() }; - let n = int::from_str(args[1]).get(); + let n = int::from_str(args[1]).unwrap(); let iub: ~[AminoAcids] = make_cumulative(~[acid('a', 27u32), acid('c', 12u32), acid('g', 12u32), diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs index 7b8bc31bf1c..9c07df36eb3 100644 --- a/src/test/bench/shootout-fibo.rs +++ b/src/test/bench/shootout-fibo.rs @@ -31,6 +31,6 @@ fn main() { } else { args }; - let n = int::from_str(args[1]).get(); + let n = int::from_str(args[1]).unwrap(); printfln!("%d\n", fib(n)); } diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index 16936f6ed72..cf43f470e71 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -9,7 +9,7 @@ static LIMIT: f64 = 2.0; #[fixed_stack_segment] fn main() { unsafe { - let w: i32 = FromStr::from_str(os::args()[1]).get(); + let w: i32 = FromStr::from_str(os::args()[1]).unwrap(); let h = w; let mut byte_acc: i8 = 0; let mut bit_num: i32 = 0; diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs index 99bd7c0f786..115607d0a99 100644 --- a/src/test/bench/shootout-nbody.rs +++ b/src/test/bench/shootout-nbody.rs @@ -137,7 +137,7 @@ fn offset_momentum(bodies: &mut [Planet, ..N_BODIES]) { } fn main() { - let n: i32 = FromStr::from_str(os::args()[1]).get(); + let n: i32 = FromStr::from_str(os::args()[1]).unwrap(); let mut bodies = BODIES; offset_momentum(&mut bodies); diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 663ebcac334..611b11560e4 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -110,7 +110,7 @@ fn main() { if opts.stress { stress(2); } else { - let max = uint::parse_bytes(args[1].as_bytes(), 10u).get() as int; + let max = uint::parse_bytes(args[1].as_bytes(), 10u).unwrap() as int; let num_trials = 10; diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout-spectralnorm.rs index e3c3c19c33b..aef22bc2b84 100644 --- a/src/test/bench/shootout-spectralnorm.rs +++ b/src/test/bench/shootout-spectralnorm.rs @@ -52,7 +52,7 @@ fn mult_AtAv(v: &mut [f64], out: &mut [f64], tmp: &mut [f64]) { #[fixed_stack_segment] fn main() { - let n: uint = FromStr::from_str(os::args()[1]).get(); + let n: uint = FromStr::from_str(os::args()[1]).unwrap(); let mut u = vec::from_elem(n, 1f64); let mut v = u.clone(); let mut tmp = u.clone(); diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout-threadring.rs index 203b9c297fa..ace008c1f95 100644 --- a/src/test/bench/shootout-threadring.rs +++ b/src/test/bench/shootout-threadring.rs @@ -62,13 +62,13 @@ fn main() { os::args() }; let token = if args.len() > 1u { - FromStr::from_str(args[1]).get() + FromStr::from_str(args[1]).unwrap() } else { 1000 }; let n_tasks = if args.len() > 2u { - FromStr::from_str(args[2]).get() + FromStr::from_str(args[2]).unwrap() } else { 503 diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs index 2c2073eafea..a035041a662 100644 --- a/src/test/bench/std-smallintmap.rs +++ b/src/test/bench/std-smallintmap.rs @@ -39,8 +39,8 @@ fn main() { } else { args }; - let max = uint::from_str(args[1]).get(); - let rep = uint::from_str(args[2]).get(); + let max = uint::from_str(args[1]).unwrap(); + let rep = uint::from_str(args[2]).unwrap(); let mut checkf = 0.0; let mut appendf = 0.0; diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index 49b2c32ed68..67573540895 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -75,9 +75,9 @@ impl Sudoku { let comps: ~[&str] = line.trim().split_iter(',').collect(); if comps.len() == 3u { - let row = uint::from_str(comps[0]).get() as u8; - let col = uint::from_str(comps[1]).get() as u8; - g[row][col] = uint::from_str(comps[2]).get() as u8; + let row = uint::from_str(comps[0]).unwrap() as u8; + let col = uint::from_str(comps[1]).unwrap() as u8; + g[row][col] = uint::from_str(comps[2]).unwrap() as u8; } else { fail!("Invalid sudoku file"); diff --git a/src/test/bench/task-perf-jargon-metal-smoke.rs b/src/test/bench/task-perf-jargon-metal-smoke.rs index 4e27841a748..be7f9b5f43a 100644 --- a/src/test/bench/task-perf-jargon-metal-smoke.rs +++ b/src/test/bench/task-perf-jargon-metal-smoke.rs @@ -52,7 +52,7 @@ fn main() { }; let (p,c) = comm::stream(); - child_generation(uint::from_str(args[1]).get(), c); + child_generation(uint::from_str(args[1]).unwrap(), c); if p.try_recv().is_none() { fail!("it happened when we slumbered"); } diff --git a/src/test/bench/task-perf-linked-failure.rs b/src/test/bench/task-perf-linked-failure.rs index 6ab83e5b383..95dd803af81 100644 --- a/src/test/bench/task-perf-linked-failure.rs +++ b/src/test/bench/task-perf-linked-failure.rs @@ -71,7 +71,7 @@ fn main() { args.clone() }; - let num_tasks = uint::from_str(args[1]).get(); + let num_tasks = uint::from_str(args[1]).unwrap(); // Main group #0 waits for unsupervised group #1. // Grandparent group #1 waits for middle group #2, then fails, killing #3. diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/task-perf-spawnalot.rs index a152c302133..83116ae3c87 100644 --- a/src/test/bench/task-perf-spawnalot.rs +++ b/src/test/bench/task-perf-spawnalot.rs @@ -31,7 +31,7 @@ fn main() { } else { args }; - let n = uint::from_str(args[1]).get(); + let n = uint::from_str(args[1]).unwrap(); let mut i = 0u; while i < n { task::spawn(|| f(n) ); i += 1u; } } diff --git a/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs index 451616a074f..cb629068681 100644 --- a/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs @@ -17,7 +17,7 @@ fn main() { y = Some(x.downgrade(write_mode)); //~^ ERROR cannot infer an appropriate lifetime } - y.get(); + y.unwrap(); // Adding this line causes a method unification failure instead // do (&option::unwrap(y)).read |state| { assert!(*state == 1); } } diff --git a/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs index b6535b6189a..75e1989aff0 100644 --- a/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs @@ -17,7 +17,7 @@ fn main() { do x.write_downgrade |write_mode| { y = Some(write_mode); } - y.get(); + y.unwrap(); // Adding this line causes a method unification failure instead // do (&option::unwrap(y)).write |state| { assert!(*state == 1); } } diff --git a/src/test/run-fail/result-get-fail.rs b/src/test/run-fail/result-get-fail.rs index 782ce61cab2..4f552bc8f42 100644 --- a/src/test/run-fail/result-get-fail.rs +++ b/src/test/run-fail/result-get-fail.rs @@ -8,10 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:get called on `Err` result: ~"kitty" +// error-pattern:called `Result::unwrap()` on `Err` value: kitty use std::result; fn main() { - error!(result::Err::<int,~str>(~"kitty").get()); + error!(result::Err::<int,~str>(~"kitty").unwrap()); } diff --git a/src/test/run-pass/borrowck-wg-borrow-mut-to-imm.rs b/src/test/run-pass/borrowck-wg-borrow-mut-to-imm.rs index 3b18a8649ee..668f602b3d3 100644 --- a/src/test/run-pass/borrowck-wg-borrow-mut-to-imm.rs +++ b/src/test/run-pass/borrowck-wg-borrow-mut-to-imm.rs @@ -1,5 +1,5 @@ fn g(x: &Option<int>) { - println(x.get().to_str()); + println(x.unwrap().to_str()); } fn f(x: &mut Option<int>) { diff --git a/src/test/run-pass/borrowed-ptr-pattern-option.rs b/src/test/run-pass/borrowed-ptr-pattern-option.rs index 4775e5fe0a8..9f17b9d7f95 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-option.rs +++ b/src/test/run-pass/borrowed-ptr-pattern-option.rs @@ -19,5 +19,5 @@ fn select<'r>(x: &'r Option<int>, y: &'r Option<int>) -> &'r Option<int> { pub fn main() { let x = None; let y = Some(3); - assert_eq!(select(&x, &y).get(), 3); + assert_eq!(select(&x, &y).unwrap(), 3); } diff --git a/src/test/run-pass/option_addition.rs b/src/test/run-pass/option_addition.rs index fe39d1b11d3..8af173150a0 100644 --- a/src/test/run-pass/option_addition.rs +++ b/src/test/run-pass/option_addition.rs @@ -9,29 +9,17 @@ // except according to those terms. pub fn main() { - let foo = 1; - let bar = 2; + let foo: int = 1; + let bar: int = 2; let foobar = foo + bar; - let nope = optint(0) + optint(0); - let somefoo = optint(foo) + optint(0); - let somebar = optint(bar) + optint(0); - let somefoobar = optint(foo) + optint(bar); + let nope = None::<int> + None::<int>; + let somefoo = Some(foo) + None::<int>; + let somebar = None::<int> + Some(bar); + let somefoobar = Some(foo) + Some(bar); - match nope { - None => (), - Some(foo) => fail!("expected None, but found %?", foo) - } - assert_eq!(foo, somefoo.get()); - assert_eq!(bar, somebar.get()); - assert_eq!(foobar, somefoobar.get()); -} - -fn optint(input: int) -> Option<int> { - if input == 0 { - return None; - } - else { - return Some(input); - } + assert_eq!(nope, None::<int>); + assert_eq!(somefoo, None::<int>); + assert_eq!(somebar, None::<int>); + assert_eq!(foobar, somefoobar.unwrap()); } diff --git a/src/test/run-pass/region-dependent-addr-of.rs b/src/test/run-pass/region-dependent-addr-of.rs index ac2fc2eda23..f5eb04dd83b 100644 --- a/src/test/run-pass/region-dependent-addr-of.rs +++ b/src/test/run-pass/region-dependent-addr-of.rs @@ -105,13 +105,13 @@ pub fn main() { assert_eq!(*p, a.value.v5.f); let p = get_v6_a(&a, 1); - assert_eq!(*p, a.value.v6.get().f); + assert_eq!(*p, a.value.v6.unwrap().f); let p = get_v6_b(&a, 1); - assert_eq!(*p, a.value.v6.get().f); + assert_eq!(*p, a.value.v6.unwrap().f); let p = get_v6_c(&a, 1); - assert_eq!(*p, a.value.v6.get().f); + assert_eq!(*p, a.value.v6.unwrap().f); let p = get_v5_ref(&a, 1); assert_eq!(*p, a.value.v5.f); |