about summary refs log tree commit diff
path: root/src/bin
diff options
context:
space:
mode:
authorMaximilian Roos <m@maxroos.com>2018-09-01 16:26:47 -0400
committerMaximilian Roos <m@maxroos.com>2018-09-01 16:32:38 -0400
commit968affc3e0bd713d2e4c46f273eca8b988c469ae (patch)
treeaf70af41792b8080d88ceecaf8fc07afe5c9e7d0 /src/bin
parentb1da2a53b489f86c17771a2b77acabdd236a115d (diff)
final clippy changes
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/main.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 760333955a0..a3d2819e1db 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -172,19 +172,19 @@ fn execute(opts: &Options) -> Result<i32, failure::Error> {
     match determine_operation(&matches)? {
         Operation::Help(HelpOp::None) => {
             print_usage_to_stdout(opts, "");
-            return Ok(0);
+            Ok(0)
         }
         Operation::Help(HelpOp::Config) => {
             Config::print_docs(&mut stdout(), options.unstable_features);
-            return Ok(0);
+            Ok(0)
         }
         Operation::Help(HelpOp::FileLines) => {
             print_help_file_lines();
-            return Ok(0);
+            Ok(0)
         }
         Operation::Version => {
             print_version();
-            return Ok(0);
+            Ok(0)
         }
         Operation::ConfigOutputDefault { path } => {
             let toml = Config::default().all_options().to_toml().map_err(err_msg)?;
@@ -194,13 +194,13 @@ fn execute(opts: &Options) -> Result<i32, failure::Error> {
             } else {
                 io::stdout().write_all(toml.as_bytes())?;
             }
-            return Ok(0);
+            Ok(0)
         }
         Operation::Stdin { input } => format_string(input, options),
         Operation::Format {
             files,
             minimal_config_path,
-        } => format(files, minimal_config_path, options),
+        } => format(files, minimal_config_path, &options),
     }
 }
 
@@ -236,7 +236,7 @@ fn format_string(input: String, options: GetOptsOptions) -> Result<i32, failure:
 fn format(
     files: Vec<PathBuf>,
     minimal_config_path: Option<String>,
-    options: GetOptsOptions,
+    options: &GetOptsOptions,
 ) -> Result<i32, failure::Error> {
     options.verify_file_lines(&files);
     let (config, config_path) = load_config(None, Some(options.clone()))?;