Auto merge of #1160 - alexcrichton:update, r=alexcrichton

Author: bors

Cargo.lock

@@ -9,7 +9,7 @@ use cargo::util::important_paths::{find_root_manifest_for_cwd};
 struct Options {
     flag_no_run: bool,
     flag_package: Option<String>,
-    flag_jobs: Option<uint>,
+    flag_jobs: Option<u32>,
     flag_features: Vec<String>,
     flag_bench: Option<String>,
     flag_no_default_features: bool,
@@ -76,7 +76,7 @@ pub fn execute(options: Options, shell: &mut MultiShell) -> CliResult<Option<()>
         None => Ok(None),
         Some(err) => {
             Err(match err.exit {
-                Some(ExitStatus(i)) => CliError::new("", i as uint),
+                Some(ExitStatus(i)) => CliError::new("", i as u32),
                 _ => CliError::from_boxed(box Human(err), 101)
             })
         }

src/bin/bench.rs

@@ -9,7 +9,7 @@ use cargo::util::{CliResult, CliError};
 #[derive(RustcDecodable)]
 struct Options {
     flag_package: Option<String>,
-    flag_jobs: Option<uint>,
+    flag_jobs: Option<u32>,
     flag_features: Vec<String>,
     flag_no_default_features: bool,
     flag_target: Option<String>,
@@ -44,7 +44,7 @@ current package is built. For more information on SPEC and its format, see the
 ";
 
 pub fn execute(options: Options, shell: &mut MultiShell) -> CliResult<Option<()>> {
-    debug!("executing; cmd=cargo-build; args={}", os::args());
+    debug!("executing; cmd=cargo-build; args={:?}", os::args());
     shell.set_verbose(options.flag_verbose);
 
     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));