Merge pull request #1905 from rust-lang/fix-clippy-issues

fix clippy issues

Author: marcoieni

.github/workflows/main.yml

@@ -29,11 +29,13 @@ jobs:
           fetch-depth: 50
 
       - name: Install Rust Stable
+        env:
+          RUST_VERSION: "1.85.0"
         run: |
           rustc -vV
-          rustup toolchain install 1.85.0
-          rustup default 1.85.0
-          rustup component add rustfmt
+          rustup toolchain install $RUST_VERSION
+          rustup default $RUST_VERSION
+          rustup component add rustfmt clippy
           rustc -vV
 
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
@@ -49,6 +51,9 @@ jobs:
       - name: Run rustfmt
         run: cargo fmt -- --check
 
+      - name: Run clippy
+        run: cargo clippy --workspace --all-targets --all-features -- -D warnings
+
       - name: Run tests
         run: cargo test --workspace --all-features
 

rust_team_data/src/email_encryption.rs

@@ -79,8 +79,8 @@ pub enum Error {
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
-            Error::GetRandom(e) => write!(f, "{}", e),
-            Error::Hex(e) => write!(f, "{}", e),
+            Error::GetRandom(e) => write!(f, "{e}"),
+            Error::Hex(e) => write!(f, "{e}"),
             Error::EncryptionFailed => write!(f, "encryption failed"),
             Error::DecryptionFailed => write!(f, "encryption failed"),
             Error::InvalidUtf8 => write!(f, "invalid UTF-8"),

sync-team/src/github/api/mod.rs

@@ -176,7 +176,7 @@ impl HttpClient {
                 for link in links.values() {
                     if link
                         .rel()
-                        .map(|r| r.iter().any(|r| *r == RelationType::Next))
+                        .map(|r| r.contains(&RelationType::Next))
                         .unwrap_or(false)
                     {
                         next = Some(GitHubUrl::new(link.link(), next_url.org()));

sync-team/src/github/api/write.rs

@@ -271,7 +271,7 @@ impl GitHubWrite {
             archived: settings.archived,
             allow_auto_merge: settings.auto_merge_enabled,
         };
-        debug!("Editing repo {}/{} with {:?}", org, repo_name, req);
+        debug!("Editing repo {org}/{repo_name} with {req:?}");
         if !self.dry_run {
             self.client
                 .send(Method::PATCH, &GitHubUrl::repos(org, repo_name, "")?, &req)?;
@@ -369,7 +369,7 @@ impl GitHubWrite {
         branch_protection: &BranchProtection,
         org: &str,
     ) -> anyhow::Result<()> {
-        debug!("Updating '{}' branch protection", pattern);
+        debug!("Updating '{pattern}' branch protection");
         #[derive(Debug, serde::Serialize)]
         #[serde(rename_all = "camelCase")]
         struct Params<'a> {
@@ -462,7 +462,7 @@ impl GitHubWrite {
         repo_name: &str,
         id: &str,
     ) -> anyhow::Result<()> {
-        debug!("Removing protection in {}/{}", org, repo_name);
+        debug!("Removing protection in {org}/{repo_name}");
         println!("Remove protection {id}");
         if !self.dry_run {
             #[derive(serde::Serialize)]

sync-team/src/github/tests/test_utils.rs

@@ -199,6 +199,7 @@ pub struct TeamData {
 }
 
 impl TeamData {
+    #[allow(clippy::new_ret_no_self)]
     pub fn new(name: &str) -> TeamDataBuilder {
         TeamDataBuilder::default().name(name.to_string())
     }
@@ -283,6 +284,7 @@ pub struct RepoData {
 }
 
 impl RepoData {
+    #[allow(clippy::new_ret_no_self)]
     pub fn new(name: &str) -> RepoDataBuilder {
         RepoDataBuilder::default().name(name.to_string())
     }

sync-team/src/lib.rs

@@ -24,7 +24,7 @@ pub fn run_sync_team(
     }
 
     for service in services {
-        info!("synchronizing {}", service);
+        info!("synchronizing {service}");
         match service.as_str() {
             "github" => {
                 let client = HttpClient::new()?;
@@ -33,7 +33,7 @@ pub fn run_sync_team(
                 let repos = team_api.get_repos()?;
                 let diff = create_diff(gh_read, teams, repos)?;
                 if !diff.is_empty() {
-                    info!("{}", diff);
+                    info!("{diff}");
                 }
                 if !only_print_plan {
                     let gh_write = GitHubWrite::new(client, dry_run)?;
@@ -51,7 +51,7 @@ pub fn run_sync_team(
                 let sync = SyncZulip::new(username, token, &team_api, dry_run)?;
                 let diff = sync.diff_all()?;
                 if !diff.is_empty() {
-                    info!("{}", diff);
+                    info!("{diff}");
                 }
                 if !only_print_plan {
                     diff.apply(&sync)?;

sync-team/src/mailgun/api.rs

@@ -89,7 +89,7 @@ impl Mailgun {
     }
 
     pub(super) fn delete_route(&self, id: &str) -> Result<(), Error> {
-        info!("deleting route with ID {}", id);
+        info!("deleting route with ID {id}");
         if self.dry_run {
             return Ok(());
         }

sync-team/src/team_api.rs

@@ -54,7 +54,7 @@ impl TeamApi {
                     .map(Cow::Owned)
                     .unwrap_or_else(|_| Cow::Borrowed(rust_team_data::v1::BASE_URL));
                 let url = format!("{base}/{url}");
-                trace!("http request: GET {}", url);
+                trace!("http request: GET {url}");
                 Ok(reqwest::blocking::get(&url)?
                     .error_for_status()?
                     .json_annotated()?)

sync-team/src/zulip/api.rs

@@ -37,10 +37,7 @@ impl ZulipApi {
         member_ids: &[u64],
     ) -> anyhow::Result<()> {
         log::info!(
-            "creating Zulip user group '{}' with description '{}' and member ids: {:?}",
-            user_group_name,
-            description,
-            member_ids
+            "creating Zulip user group '{user_group_name}' with description '{description}' and member ids: {member_ids:?}"
         );
         if self.dry_run {
             return Ok(());
@@ -64,7 +61,7 @@ impl ZulipApi {
             };
             let error = body.get("msg").ok_or_else(err)?.as_str().ok_or_else(err)?;
             if error.contains("already exists") {
-                log::debug!("Zulip user group '{}' already existed", user_group_name);
+                log::debug!("Zulip user group '{user_group_name}' already existed");
                 return Ok(());
             } else {
                 return Err(err());
@@ -157,17 +154,13 @@ impl ZulipApi {
     ) -> anyhow::Result<()> {
         if add_ids.is_empty() && remove_ids.is_empty() {
             log::debug!(
-                "user group {} does not need to have its group members updated",
-                user_group_id
+                "user group {user_group_id} does not need to have its group members updated"
             );
             return Ok(());
         }
 
         log::info!(
-            "updating user group {} by adding {:?} and removing {:?}",
-            user_group_id,
-            add_ids,
-            remove_ids
+            "updating user group {user_group_id} by adding {add_ids:?} and removing {remove_ids:?}"
         );
 
         if self.dry_run {
@@ -205,19 +198,11 @@ impl ZulipApi {
         remove_ids: &[u64],
     ) -> anyhow::Result<()> {
         if add_ids.is_empty() && remove_ids.is_empty() {
-            log::debug!(
-                "stream {} does not need to have its members updated",
-                stream_id
-            );
+            log::debug!("stream {stream_id} does not need to have its members updated");
             return Ok(());
         }
 
-        log::info!(
-            "updating stream {} by adding {:?} and removing {:?}",
-            stream_id,
-            add_ids,
-            remove_ids
-        );
+        log::info!("updating stream {stream_id} by adding {add_ids:?} and removing {remove_ids:?}");
 
         if self.dry_run {
             return Ok(());

sync-team/src/zulip/mod.rs

@@ -389,7 +389,7 @@ fn get_user_group_definitions(
                     ZulipGroupMember::Email(e) => {
                         let id = email_map.get(e);
                         if id.is_none() {
-                            log::warn!("no Zulip id found for '{}'", e);
+                            log::warn!("no Zulip id found for '{e}'");
                         }
                         id.copied()
                     }
@@ -424,7 +424,7 @@ fn get_stream_definitions(
                     ZulipStreamMember::Email(e) => {
                         let id = email_map.get(e);
                         if id.is_none() {
-                            log::warn!("no Zulip id found for '{}'", e);
+                            log::warn!("no Zulip id found for '{e}'");
                         }
                         id.copied()
                     }