Rename --setup to --prepare

src/main.rs

@@ -52,12 +52,6 @@ fn main() {
                 .multiple(true)
                 .empty_values(false),
         )
-        .arg(
-            Arg::with_name("ignore-failure")
-                .long("ignore-failure")
-                .short("i")
-                .help("Ignore non-zero exit codes"),
-        )
         .arg(
             Arg::with_name("warmup")
                 .long("warmup")
@@ -81,20 +75,24 @@ fn main() {
                 )),
         )
         .arg(
-            Arg::with_name("setup")
-                .long("setup")
-                .short("S")
+            Arg::with_name("prepare")
+                .long("prepare")
+                .short("p")
                 .takes_value(true)
                 .value_name("CMD")
                 .help(
-                    "Execute CMD before each benchmark run. This is useful for \
+                    "Execute CMD before each timing run. This is useful for \
                      clearing disk caches, for example",
                 ),
         )
+        .arg(
+            Arg::with_name("ignore-failure")
+                .long("ignore-failure")
+                .short("i")
+                .help("Ignore non-zero exit codes"),
+        )
         .get_matches();
 
-    options.ignore_failure = matches.is_present("ignore-failure");
-
     let str_to_u64 = |n| u64::from_str_radix(n, 10).ok();
 
     options.warmup_count = matches
@@ -107,7 +105,9 @@ fn main() {
         options.min_runs = cmp::max(2, min_runs);
     }
 
-    options.setup_command = matches.value_of("setup").map(String::from);
+    options.preparation_command = matches.value_of("prepare").map(String::from);
+
+    options.ignore_failure = matches.is_present("ignore-failure");
 
     let commands = matches.values_of("command").unwrap().collect();
     let res = run(&commands, &options);