Resolve clippy issues

Author: Kobzol

src/bors/handlers/mod.rs

@@ -39,7 +39,7 @@ pub async fn handle_bors_repository_event(
         .read()
         .unwrap()
         .get(event.repository())
-        .map(Arc::clone)
+        .cloned()
     else {
         return Err(anyhow::anyhow!(
             "Repository {} not found in the bot state",

src/github/api/client.rs

@@ -131,7 +131,7 @@ impl GithubRepositoryClient {
         head: &CommitSha,
         commit_message: &str,
     ) -> Result<CommitSha, MergeError> {
-        Ok(merge_branches(self, base, head, commit_message).await?)
+        merge_branches(self, base, head, commit_message).await
     }
 
     /// Find all check suites attached to the given commit and branch.

src/tests/mocks/mod.rs

@@ -116,14 +116,14 @@ impl ExternalHttpMock {
 /// Create a mock that dynamically responds to its requests using the given function `f`.
 /// It is expected that the path will be a regex, which will be parsed when a request is received,
 /// and matched capture groups will be passed as a second argument to `f`.
-fn dynamic_mock_req<F: Fn(&Request, [&str; N]) -> ResponseTemplate, const N: usize>(
+fn dynamic_mock_req<
+    F: Fn(&Request, [&str; N]) -> ResponseTemplate + Send + Sync + 'static,
+    const N: usize,
+>(
     f: F,
     m: &str,
     regex: String,
-) -> Mock
-where
-    F: Send + Sync + 'static,
-{
+) -> Mock {
     // We need to parse the regex from the request path again, because wiremock doesn't give
     // the parsed path regex results to us :(
     let parsed_regex = Regex::new(&regex).unwrap();

src/tests/mocks/pull_request.rs

@@ -24,10 +24,9 @@ pub async fn mock_pull_requests(
     comments_tx: Sender<Comment>,
     mock_server: &MockServer,
 ) {
-    let repo_arc = repo;
-    let repo = repo_arc.lock();
-    let repo_name = repo.name.clone();
-    for &pr_number in repo.pull_requests.keys() {
+    let repo_name = repo.lock().name.clone();
+    let prs = repo.lock().pull_requests.clone();
+    for &pr_number in prs.keys() {
         Mock::given(method("GET"))
             .and(path(format!("/repos/{repo_name}/pulls/{pr_number}")))
             .respond_with(
@@ -36,18 +35,23 @@ pub async fn mock_pull_requests(
             .mount(mock_server)
             .await;
 
-        mock_pr_comments(&repo, pr_number, comments_tx.clone(), mock_server).await;
-        mock_pr_labels(repo_arc.clone(), repo_name.clone(), pr_number, mock_server).await;
+        mock_pr_comments(
+            repo_name.clone(),
+            pr_number,
+            comments_tx.clone(),
+            mock_server,
+        )
+        .await;
+        mock_pr_labels(repo.clone(), repo_name.clone(), pr_number, mock_server).await;
     }
 }
 
 async fn mock_pr_comments(
-    repo: &Repo,
+    repo_name: GithubRepoName,
     pr_number: u64,
     comments_tx: Sender<Comment>,
     mock_server: &MockServer,
 ) {
-    let repo_name = repo.name.clone();
     Mock::given(method("POST"))
         .and(path(format!(
             "/repos/{repo_name}/issues/{pr_number}/comments",

src/tests/mocks/repository.rs

@@ -201,7 +201,7 @@ impl Branch {
 
 impl Default for Branch {
     fn default() -> Self {
-        Self::new(&default_branch_name(), &default_branch_sha())
+        Self::new(default_branch_name(), default_branch_sha())
     }
 }
 
@@ -334,7 +334,7 @@ async fn mock_create_branch(repo: Arc<Mutex<Repo>>, mock_server: &MockServer) {
                 }
                 None => {
                     // Create a new branch
-                    repo.branches.push(Branch::new(&branch_name, &sha));
+                    repo.branches.push(Branch::new(branch_name, &sha));
                 }
             }
 
@@ -481,18 +481,21 @@ async fn mock_check_suites(repo: Arc<Mutex<Repo>>, mock_server: &MockServer) {
 }
 
 async fn mock_config(repo: Arc<Mutex<Repo>>, mock_server: &MockServer) {
-    let repo = repo.lock();
-    Mock::given(method("GET"))
-        .and(path(format!(
-            "/repos/{}/contents/rust-bors.toml",
-            repo.name
-        )))
-        .respond_with(
-            ResponseTemplate::new(200)
-                .set_body_json(GitHubContent::new("rust-bors.toml", &repo.config)),
-        )
-        .mount(mock_server)
-        .await;
+    // Extracted into a block to avoid holding the lock over an await point
+    let mock = {
+        let repo = repo.lock();
+        Mock::given(method("GET"))
+            .and(path(format!(
+                "/repos/{}/contents/rust-bors.toml",
+                repo.name
+            )))
+            .respond_with(
+                ResponseTemplate::new(200)
+                    .set_body_json(GitHubContent::new("rust-bors.toml", &repo.config)),
+            )
+            .mount(mock_server)
+    };
+    mock.await;
 }
 
 /// Represents all repositories for an installation

src/tests/util.rs

@@ -8,7 +8,7 @@ pub struct TestSyncMarker {
 impl TestSyncMarker {
     pub const fn new() -> Self {
         Self {
-            state: Lazy::new(|| TestSyncMarkerInner::new()),
+            state: Lazy::new(TestSyncMarkerInner::new),
         }
     }