diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2013-12-23 16:20:52 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2014-01-21 15:48:47 -0800 |
| commit | bada25e425ae30583ad343e36a034e59c66fcad6 (patch) | |
| tree | 4e07ddbe72ef54075d401322c8283de064f02b4e /src/compiletest | |
| parent | aa66b91767ce92c45192ca11718575529d631d21 (diff) | |
| download | rust-bada25e425ae30583ad343e36a034e59c66fcad6.tar.gz rust-bada25e425ae30583ad343e36a034e59c66fcad6.zip | |
[std::vec] Rename .pop_opt() to .pop(), drop the old .pop() behavior
Diffstat (limited to 'src/compiletest')
| -rw-r--r-- | src/compiletest/header.rs | 6 | ||||
| -rw-r--r-- | src/compiletest/runtest.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs index 54d99151233..ee4d74ce169 100644 --- a/src/compiletest/header.rs +++ b/src/compiletest/header.rs @@ -159,10 +159,10 @@ fn parse_exec_env(line: &str) -> Option<(~str, ~str)> { let mut strs: ~[~str] = nv.splitn('=', 1).map(|s| s.to_owned()).collect(); match strs.len() { - 1u => (strs.pop(), ~""), + 1u => (strs.pop().unwrap(), ~""), 2u => { - let end = strs.pop(); - (strs.pop(), end) + let end = strs.pop().unwrap(); + (strs.pop().unwrap(), end) } n => fail!("Expected 1 or 2 strings, not {}", n) } diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index e06f4e32631..6f8a3ad83a3 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -917,7 +917,7 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps, // get bare program string let mut tvec: ~[~str] = args.prog.split('/').map(|ts| ts.to_owned()).collect(); - let prog_short = tvec.pop(); + let prog_short = tvec.pop().unwrap(); // copy to target let copy_result = procsrv::run("", config.adb_path, |