Fixup changes from master

src/cmd/test.rs

@@ -40,19 +40,19 @@ pub fn make_subcommand<'help>() -> App<'help> {
             .multiple_occurrences(true)
             .forbid_empty_values(true)
             .help("A comma-separated list of directories to add to {n}the crate search path when building tests"))
-        .arg(Arg::with_name("extern")
+        .arg(Arg::new("extern")
             .long("extern")
             .value_name("file")
             .takes_value(true)
             .require_delimiter(false)
-            .multiple(true)
-            .empty_values(false)
+            .multiple_values(true)
+            .multiple_occurrences(true)
+            .forbid_empty_values(false)
             .help(EXTERN_HELP))
-        .arg(Arg::with_name("verbose")
+        .arg(Arg::new("verbose")
             .long("verbose")
-            .short("v")
+            .short('v')
             .takes_value(false)
-            .multiple(false)
             .help("Enables verbose logging with the test command."))
 }