Fix clippy warnings

src/git.rs

@@ -17,7 +17,7 @@ impl BranchLocation {
     }
 }
 
-static LOCAL_CHANGES_WARNING: &'static str = "\
+static LOCAL_CHANGES_WARNING: &str = "\
 The Wizard advises against rebasing while there are changes to the local git repo.
 
 Please commit, stash, or discard your changes before proceeding.";
@@ -88,14 +88,14 @@ pub fn current_branch_name() -> String {
         .to_string()
 }
 
-pub fn extract_ref(branch_line: &str) -> &str {
+pub fn extract_ref(branch_line: &str) -> Option<&str> {
     let re = Regex::new(r"\s*(\w\S*)\s").unwrap();
 
-    for caps in re.captures_iter(branch_line) {
-        return caps.get(1).unwrap().as_str();
+    if let Some(capture) = re.captures_iter(branch_line).next() {
+        Some(capture.get(1).unwrap().as_str())
+    } else {
+        None
     }
-
-    return "";
 }
 
 #[cfg(test)]
@@ -109,9 +109,9 @@ mod tests {
         let sample3 = "   origin/foo/bar-baz         770b0814b WIP!";
         let sample4 = "   fa1afe1         WIP!";
 
-        assert_eq!(extract_ref(sample), "foo/bar-baz");
-        assert_eq!(extract_ref(sample2), "foo/bark-bazz");
-        assert_eq!(extract_ref(sample3), "origin/foo/bar-baz");
-        assert_eq!(extract_ref(sample4), "fa1afe1");
+        assert_eq!(extract_ref(sample).unwrap(), "foo/bar-baz");
+        assert_eq!(extract_ref(sample2).unwrap(), "foo/bark-bazz");
+        assert_eq!(extract_ref(sample3).unwrap(), "origin/foo/bar-baz");
+        assert_eq!(extract_ref(sample4).unwrap(), "fa1afe1");
     }
 }

src/sk.rs

@@ -23,7 +23,7 @@ impl<'b, 'a: 'b> From<SimpleOptions<'a>> for SkimOptions<'b> {
 pub fn one(source: SkimItemReceiver, options: SimpleOptions) -> String {
     let skim_output = Skim::run_with(&options.into(), Some(source))
         .map(|out| out.selected_items)
-        .unwrap_or_else(|| Vec::new());
+        .unwrap_or_else(Vec::new);
 
     let selected_item = skim_output.first().unwrap_or_else(|| {
         eprintln!("Nothing selected. Aborting.");

src/subcommands/branch_jump.rs

@@ -10,7 +10,7 @@ pub fn jump(config: &cli::Config) {
     let branch_point = pick_branch_point(&current_branch_name, &target_branch, &config);
 
     println!("The Rebase Wizard has seen your future:");
-    println!("");
+    println!();
     println!("Run the following command when you are ready:");
     println!("  git rebase --onto {} {}", target_branch, branch_point);
 }
@@ -37,7 +37,9 @@ pub fn pick_target_branch(current_branch_name: &str, config: &cli::Config) -> St
     let branches = git::all_branches();
     let selection = sk::one(sk::to_source(branches), options);
 
-    git::extract_ref(&selection).to_string()
+    git::extract_ref(&selection)
+        .expect("branch name not found")
+        .to_string()
 }
 
 pub fn pick_branch_point(
@@ -69,5 +71,7 @@ pub fn pick_branch_point(
     let commits = git::recent_commits();
     let selection = sk::one(sk::to_source(commits), options);
 
-    git::extract_ref(&selection).to_string()
+    git::extract_ref(&selection)
+        .expect("commit sha not found")
+        .to_string()
 }

src/subcommands/tutorial.rs

@@ -1,4 +1,4 @@
-pub static SECRETS_TEXT: &'static str = r"
+pub static SECRETS_TEXT: &str = r"
 Wizard Secrets: 🧙‍♂️
 
   git rebase --onto TARGET_BRANCH  BRANCH_POINT
@@ -12,9 +12,9 @@ Wizard Secrets: 🧙‍♂️
                                  First commit you didn't author on this branch
 ";
 
-pub static MORE_HELP_TEASER: &'static str = "For more secrets 🔮, try running the --tutorial flag.";
+pub static MORE_HELP_TEASER: &str = "For more secrets 🔮, try running the --tutorial flag.";
 
-pub static TUTORIAL_TEXT: &'static str = r"
+pub static TUTORIAL_TEXT: &str = r"
   *Branch Jumping*: It isn't uncommon to need to move your feature branch from
   being based on one branch to another. This requires picking the exact right
   arguments for `git rebase --onto`.