Auto merge of #1278 - alexcrichton:style, r=brson

* Update to rust master
* Remove many calls to `.as_slice` (deref coercions)
* Remove `get_` prefixes

Author: bors

Cargo.lock

@@ -61,7 +61,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
             jobs: options.flag_jobs,
             target: options.flag_target.as_ref().map(|s| s.as_slice()),
             dev_deps: true,
-            features: options.flag_features.as_slice(),
+            features: &options.flag_features,
             no_default_features: options.flag_no_default_features,
             spec: options.flag_package.as_ref().map(|s| s.as_slice()),
             lib_only: false,
@@ -70,14 +70,14 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     };
 
     let err = try!(ops::run_benches(&root, &ops,
-                                    options.arg_args.as_slice()).map_err(|err| {
+                                    &options.arg_args).map_err(|err| {
         CliError::from_boxed(err, 101)
     }));
     match err {
         None => Ok(None),
         Some(err) => {
             Err(match err.exit {
-                Some(ExitStatus(i)) => CliError::new("", i as u32),
+                Some(ExitStatus(i)) => CliError::new("", i as i32),
                 _ => CliError::from_boxed(box Human(err), 101)
             })
         }

src/bin/bench.rs

@@ -64,7 +64,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         jobs: options.flag_jobs,
         target: options.flag_target.as_ref().map(|t| t.as_slice()),
         dev_deps: false,
-        features: options.flag_features.as_slice(),
+        features: &options.flag_features,
         no_default_features: options.flag_no_default_features,
         spec: options.flag_package.as_ref().map(|s| s.as_slice()),
         lib_only: options.flag_lib,