Fix clippy warnings and code formatting

`cargo clippy --fix && cargo fmt` generated the changes in this commit. Test Plan: `cargo check && cargo clippy && cargo test` Reviewers: flooey, jozef-mokry Reviewed By: flooey Pull Request: #162
spacedentist · Apr 25, 2023 · 2e4b0c1 · 2e4b0c1
1 parent 4bc5837
commit 2e4b0c1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 31 deletions.
diff --git a/spr/src/commands/diff.rs b/spr/src/commands/diff.rs
@@ -11,8 +11,8 @@ use crate::{
     error::{add_error, Error, Result, ResultExt},
     git::PreparedCommit,
     github::{
-        PullRequest, PullRequestRequestReviewers, PullRequestState,
-        PullRequestUpdate, GitHub
+        GitHub, PullRequest, PullRequestRequestReviewers, PullRequestState,
+        PullRequestUpdate,
     },
     message::{validate_commit_message, MessageSection},
     output::{output, write_commit_title},
@@ -237,7 +237,12 @@ async fn diff_impl(
             for reviewer in reviewers {
                 // Teams are indicated with a leading #
                 if let Some(slug) = reviewer.strip_prefix('#') {
-                    if let Ok(team) = GitHub::get_github_team((&config.owner).into(), slug.into()).await {
+                    if let Ok(team) = GitHub::get_github_team(
+                        (&config.owner).into(),
+                        slug.into(),
+                    )
+                    .await
+                    {
                         requested_reviewers
                             .team_reviewers
                             .push(team.slug.to_string());
@@ -249,24 +254,24 @@ async fn diff_impl(
                             reviewer
                         )));
                     }
-                } else {
-                    if let Ok(user) = GitHub::get_github_user(reviewer.clone()).await {
-                        requested_reviewers.reviewers.push(user.login);
-                        if let Some(name) = user.name {
-                            checked_reviewers.push(format!(
-                                "{} ({})",
-                                reviewer.clone(),
-                                remove_all_parens(&name)
-                            ));
-                        } else {
-                            checked_reviewers.push(reviewer);
-                        }
+                } else if let Ok(user) =
+                    GitHub::get_github_user(reviewer.clone()).await
+                {
+                    requested_reviewers.reviewers.push(user.login);
+                    if let Some(name) = user.name {
+                        checked_reviewers.push(format!(
+                            "{} ({})",
+                            reviewer.clone(),
+                            remove_all_parens(&name)
+                        ));
                     } else {
-                        return Err(Error::new(format!(
-                            "Reviewers field contains unknown user '{}'",
-                            reviewer
-                        )));
+                        checked_reviewers.push(reviewer);
                     }
+                } else {
+                    return Err(Error::new(format!(
+                        "Reviewers field contains unknown user '{}'",
+                        reviewer
+                    )));
                 }
             }
 

diff --git a/spr/src/commands/init.rs b/spr/src/commands/init.rs
@@ -200,7 +200,7 @@ fn validate_branch_prefix(branch_prefix: &str) -> Result<()> {
     if branch_prefix.contains("/.")
         || branch_prefix.contains(".lock/")
         || branch_prefix.ends_with(".lock")
-        || branch_prefix.starts_with(".")
+        || branch_prefix.starts_with('.')
     {
         return Err(Error::new("Branch prefix cannot have slash-separated component beginning with a dot . or ending with the sequence .lock"));
     }
@@ -251,10 +251,7 @@ mod tests {
                 "spr/.bad",
                 "Cannot start slash-separated component with dot",
             ),
-            (
-                ".bad",
-                "Cannot start slash-separated component with dot",
-            ),
+            (".bad", "Cannot start slash-separated component with dot"),
             ("spr/bad.lock", "Cannot end with .lock"),
             (
                 "spr/bad.lock/some_more",

diff --git a/spr/src/git.rs b/spr/src/git.rs
@@ -353,7 +353,7 @@ impl Git {
     }
 
     pub fn write_index(&self, mut index: git2::Index) -> Result<Oid> {
-        Ok(index.write_tree_to(&*self.repo())?)
+        Ok(index.write_tree_to(&self.repo())?)
     }
 
     pub fn get_tree_oid_for_commit(&self, oid: Oid) -> Result<Oid> {

diff --git a/spr/src/github.rs b/spr/src/github.rs
@@ -150,12 +150,15 @@ impl GitHub {
             .map_err(Error::from)
     }
 
-    pub async fn get_github_team(owner: String, team: String) -> Result<octocrab::models::teams::Team> {
+    pub async fn get_github_team(
+        owner: String,
+        team: String,
+    ) -> Result<octocrab::models::teams::Team> {
         octocrab::instance()
-          .teams(owner)
-          .get(team)
-          .await
-          .map_err(Error::from)
+            .teams(owner)
+            .get(team)
+            .await
+            .map_err(Error::from)
     }
 
     pub async fn get_pull_request(self, number: u64) -> Result<PullRequest> {

diff --git a/spr/src/main.rs b/spr/src/main.rs
@@ -89,7 +89,7 @@ pub async fn spr() -> Result<()> {
     let cli = Cli::parse();
 
     if let Some(path) = &cli.cd {
-        if let Err(err) = std::env::set_current_dir(&path) {
+        if let Err(err) = std::env::set_current_dir(path) {
             eprintln!("Could not change directory to {:?}", &path);
             return Err(err.into());
         }