Run Clippy on the repo and clean up its suggestions (#27)

Author: mcasper

src/branches.rs

@@ -8,7 +8,7 @@ pub struct Branches {
 
 impl Branches {
     pub fn new(branches: Vec<String>) -> Branches {
-        let trimmed_string = branches.join("\n").trim_right_matches("\n").into();
+        let trimmed_string = branches.join("\n").trim_right_matches('\n').into();
 
         Branches {
             string: trimmed_string,
@@ -28,7 +28,7 @@ impl Branches {
         };
 
         let chunks = self.vec.chunks(col_count);
-        let mut col_indices = vec![];
+        let mut col_indices = [0; 3];
 
         for i in 1..col_count {
             let index = i - 1;
@@ -40,7 +40,7 @@ impl Branches {
                 }
             }).max().unwrap();
             let next_col_start = largest_col_member + COLUMN_SPACER_LENGTH;
-            col_indices.push(next_col_start);
+            col_indices[i-1] = next_col_start;
         }
 
         let rows: Vec<String> = self.vec.chunks(col_count)
@@ -50,7 +50,7 @@ impl Branches {
     }
 }
 
-fn make_row(chunks: &[String], col_indices: &Vec<usize>) -> String {
+fn make_row(chunks: &[String], col_indices: &[usize]) -> String {
     match chunks.len() {
         1 => { chunks[0].clone() },
         2 => { format!("{b1:0$}{b2}", col_indices[0], b1 = chunks[0], b2 = chunks[1]) },

src/commands.rs

@@ -57,7 +57,7 @@ pub fn delete_local_branches(branches: &Branches) -> String {
     let xargs = spawn_piped(&["xargs", "git", "branch", "-D"]);
 
     {
-        xargs.stdin.unwrap().write_all(&branches.string.as_bytes()).unwrap()
+        xargs.stdin.unwrap().write_all(branches.string.as_bytes()).unwrap()
     }
 
     let mut branches_delete_result = String::new();
@@ -71,7 +71,7 @@ pub fn delete_remote_branches(branches: &Branches, git_options: &GitOptions) ->
     let remote_branches_cmd = run_command(&["git", "branch", "-r"]);
 
     let s = String::from_utf8(remote_branches_cmd.stdout).unwrap();
-    let all_remote_branches = s.split("\n").collect::<Vec<&str>>();
+    let all_remote_branches = s.split('\n').collect::<Vec<&str>>();
     let origin_for_trim = &format!("{}/", &git_options.remote)[..];
     let b_tree_remotes = all_remote_branches
         .iter()
@@ -94,7 +94,7 @@ pub fn delete_remote_branches(branches: &Branches, git_options: &GitOptions) ->
     xargs.stderr.unwrap().read_to_string(&mut stderr).unwrap();
 
     // Everything is written to stderr, so we need to process that
-    let split = stderr.split("\n");
+    let split = stderr.split('\n');
     let vec: Vec<&str> = split.collect();
     let mut output = vec![];
     for s in vec {

src/main.rs

@@ -60,7 +60,7 @@ fn main() {
 
     let branches = merged_branches(&git_options);
 
-    if branches.string.len() == 0 {
+    if branches.string.is_empty() {
         println!("No branches to delete, you're clean!");
         return;
     }
@@ -75,9 +75,7 @@ fn main() {
         io::stdin().read_line(&mut input).unwrap();
 
         match input.to_lowercase().as_ref() {
-            "y\n" => (),
-            "yes\n" => (),
-            "\n" => (),
+            "y\n" | "yes\n" | "\n" => (),
             _ => return,
         }
     }
@@ -116,7 +114,7 @@ fn merged_branches(git_options: &GitOptions) -> Branches {
 
     let mut merged_branches_output = String::new();
     merged_branches_filter.stdout.unwrap().read_to_string(&mut merged_branches_output).unwrap();
-    let merged_branches = merged_branches_output.split("\n").map(|b| b.trim().into()).collect::<Vec<String>>();
+    let merged_branches = merged_branches_output.split('\n').map(|b| b.trim().into()).collect::<Vec<String>>();
 
     let local_branches_regex = format!("\\*{branch}|\\s{branch}", branch = &git_options.base_branch);
     let local_branches_filter = spawn_piped(&["grep", "-vE", &local_branches_regex]);
@@ -128,7 +126,7 @@ fn merged_branches(git_options: &GitOptions) -> Branches {
 
     let mut local_branches_output = String::new();
     local_branches_filter.stdout.unwrap().read_to_string(&mut local_branches_output).unwrap();
-    let local_branches = local_branches_output.split("\n").map(|b| b.trim().into()).collect::<Vec<String>>();
+    let local_branches = local_branches_output.split('\n').map(|b| b.trim().into()).collect::<Vec<String>>();
 
     let remote_branches_regex = format!("(HEAD|{})", &git_options.base_branch);
     let remote_branches_filter = spawn_piped(&["grep", "-vE", &remote_branches_regex]);
@@ -140,7 +138,7 @@ fn merged_branches(git_options: &GitOptions) -> Branches {
 
     let mut remote_branches_output = String::new();
     remote_branches_filter.stdout.unwrap().read_to_string(&mut remote_branches_output).unwrap();
-    let remote_branches = remote_branches_output.split("\n").map(|b| b.trim().into()).collect::<Vec<String>>();
+    let remote_branches = remote_branches_output.split('\n').map(|b| b.trim().into()).collect::<Vec<String>>();
 
     for branch in local_branches {
         // First check if the local branch doesn't exist in the remote, it's the cheapest and easiest

src/options.rs

@@ -17,13 +17,13 @@ pub use self::DeleteOption::*;
 
 impl DeleteOption {
     pub fn new(opts: &Matches) -> DeleteOption {
-        return if opts.opt_present("l") {
+        if opts.opt_present("l") {
             Local
         } else if opts.opt_present("r") {
             Remote
         } else {
             Both
-        };
+        }
     }
 
     pub fn warning_message(&self) -> String {
@@ -79,7 +79,7 @@ impl GitOptions {
         let mut s = String::new();
         grep.stdout.unwrap().read_to_string(&mut s).unwrap();
 
-        if s.len() == 0 {
+        if s.is_empty() {
             return Err(GitCleanError::InvalidRemoteError)
         }
 

tests/support.rs

@@ -51,7 +51,7 @@ pub struct Project {
 
 impl Project {
     pub fn setup_command(&self, command: &str) -> TestCommandResult {
-        let command_pieces = command.split(" ").collect::<Vec<&str>>();
+        let command_pieces = command.split(' ').collect::<Vec<&str>>();
         let result = TestCommand::new(
             &self.path(),
             command_pieces[1..].to_vec(),
@@ -66,7 +66,7 @@ impl Project {
     }
 
     pub fn remote_setup_command(&self, command: &str) -> TestCommandResult {
-        let command_pieces = command.split(" ").collect::<Vec<&str>>();
+        let command_pieces = command.split(' ').collect::<Vec<&str>>();
         let result = TestCommand::new(
             &self.remote_path(),
             command_pieces[1..].to_vec(),
@@ -81,11 +81,13 @@ impl Project {
     }
 
     pub fn batch_setup_commands(&self, commands: &[&str]) {
-        commands.iter().map(|command| self.setup_command(command)).collect::<Vec<TestCommandResult>>();
+        for command in commands.iter() {
+            self.setup_command(command);
+        };
     }
 
     pub fn git_clean_command(&self, command: &str) -> TestCommand {
-        let command_pieces = command.split(" ").collect::<Vec<&str>>();
+        let command_pieces = command.split(' ').collect::<Vec<&str>>();
         TestCommand::new(&self.path(), command_pieces, path_to_git_clean())
     }
 
@@ -134,7 +136,7 @@ impl TestCommand {
 
     pub fn run(&self) -> TestCommandResult {
         let mut command = Command::new(&self.top_level_command);
-        for &(ref k, ref v) in self.envs.iter() {
+        for &(ref k, ref v) in &self.envs {
             command.env(&k, &v);
         }
         let output = command