about summary refs log tree commit diff
path: root/src/compiletest
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-30 18:51:51 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-30 18:51:51 -0800
commit67d13883f868e6b27aa00a6c69f7c748d16e1c94 (patch)
tree195395a9e6d556c7c60a1507376a75e9e0c348bb /src/compiletest
parentdd0f29ad0f3ddc48f36340cd0abff4712e882a3e (diff)
parent6abfac083feafc73e5d736177755cce3bfb7153f (diff)
downloadrust-67d13883f868e6b27aa00a6c69f7c748d16e1c94.tar.gz
rust-67d13883f868e6b27aa00a6c69f7c748d16e1c94.zip
rollup merge of #20061: aturon/stab-2-vec-slice
Conflicts:
	src/libcollections/slice.rs
	src/libcollections/vec.rs
	src/libstd/sys/windows/os.rs
Diffstat (limited to 'src/compiletest')
-rw-r--r--src/compiletest/runtest.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 6bc34f1eb2c..c513aec0b84 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -32,6 +32,7 @@ use std::io::process;
 use std::io::timer;
 use std::io;
 use std::os;
+use std::iter::repeat;
 use std::str;
 use std::string::String;
 use std::thread::Thread;
@@ -947,8 +948,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
                          proc_res: &ProcRes) {
 
     // true if we found the error in question
-    let mut found_flags = Vec::from_elem(
-        expected_errors.len(), false);
+    let mut found_flags: Vec<_> = repeat(false).take(expected_errors.len()).collect();
 
     if proc_res.status.success() {
         fatal("process did not return an error status");
@@ -1308,7 +1308,7 @@ fn make_run_args(config: &Config, props: &TestProps, testfile: &Path) ->
     // Add the arguments in the run_flags directive
     args.extend(split_maybe_args(&props.run_flags).into_iter());
 
-    let prog = args.remove(0).unwrap();
+    let prog = args.remove(0);
     return ProcArgs {
         prog: prog,
         args: args,