Merge pull request #1872 from tshepang/code-cleaning

marcoieni · web-flow · commit f99192b23717 · 2025-06-11T13:49:20.000Z
code cleaning
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,8 +1,6 @@
 [package]
 name = "rust-team"
-version = "0.1.0"
-authors = ["Alex Crichton <alex@alexcrichton.com>", "Pietro Albini <pietro@pietroalbini.org>"]
-edition = '2018'
+edition = '2021'
 license.workspace = true
 
 [dependencies]
diff --git a/src/api/github.rs b/src/api/github.rs
@@ -58,7 +58,7 @@ impl GitHubApi {
         let url = if url.starts_with("https://") {
             Cow::Borrowed(url)
         } else {
-            Cow::Owned(format!("{}{}", API_BASE, url))
+            Cow::Owned(format!("{API_BASE}{url}"))
         };
         if require_auth {
             self.require_auth()?;
@@ -68,7 +68,7 @@ impl GitHubApi {
         if let Some(token) = &self.token {
             req = req.header(
                 header::AUTHORIZATION,
-                HeaderValue::from_str(&format!("token {}", token))?,
+                HeaderValue::from_str(&format!("token {token}"))?,
             );
         }
         Ok(req)
@@ -108,7 +108,7 @@ impl GitHubApi {
 
     pub(crate) fn user(&self, login: &str) -> Result<User, Error> {
         Ok(self
-            .prepare(false, Method::GET, &format!("users/{}", login))?
+            .prepare(false, Method::GET, &format!("users/{login}"))?
             .send()?
             .error_for_status()?
             .json()?)
diff --git a/src/api/zulip.rs b/src/api/zulip.rs
@@ -77,7 +77,7 @@ impl ZulipApi {
     ) -> Result<Response, Error> {
         let mut req = self
             .client
-            .request(method, format!("{}{}", ZULIP_BASE_URL, path));
+            .request(method, format!("{ZULIP_BASE_URL}{path}"));
 
         if let Some((username, token)) = &self.auth {
             req = req.basic_auth(username, Some(token))
diff --git a/src/ci.rs b/src/ci.rs
@@ -91,9 +91,9 @@ fn generate_codeowners_content(data: Data) -> String {
             })
             .flat_map(|(team, _)| {
                 data.team(team)
-                    .expect(&format!("team {team} not found"))
+                    .unwrap_or_else(|| panic!("team {team} not found"))
                     .members(&data)
-                    .expect(&format!("team {team} members couldn't be loaded"))
+                    .unwrap_or_else(|_| panic!("team {team} members couldn't be loaded"))
             }),
     );
 
diff --git a/src/data.rs b/src/data.rs
@@ -95,7 +95,7 @@ impl Data {
     {
         for entry in std::fs::read_dir(&dir).with_context(|| {
             let dir = dir.as_ref().display();
-            format!("`load_dir` failed to read directory '{}'", dir)
+            format!("`load_dir` failed to read directory '{dir}'")
         })? {
             let path = entry?.path();
             if nested && path.is_dir() {
diff --git a/src/main.rs b/src/main.rs
@@ -164,9 +164,7 @@ impl FromStr for DataSource {
             path => {
                 let path = PathBuf::from(path);
                 if path.is_dir() {
-                    Ok(Self::Prebuilt {
-                        path: PathBuf::from(path),
-                    })
+                    Ok(Self::Prebuilt { path })
                 } else {
                     Err(
                         "--src must be a path to an existing directory, `in-tree` or `production`"
@@ -201,7 +199,7 @@ fn main() {
     env.init();
 
     if let Err(e) = run() {
-        error!("{:?}", e);
+        error!("{e:?}");
         std::process::exit(1);
     }
 }
@@ -257,7 +255,7 @@ fn run() -> Result<(), Error> {
                 bail!("person already in the repo: {}", github_name);
             }
 
-            let file = format!("people/{}.toml", github_name);
+            let file = format!("people/{github_name}.toml");
             std::fs::write(
                 &file,
                 toml::to_string_pretty(&PersonToAdd {
@@ -278,7 +276,7 @@ fn run() -> Result<(), Error> {
                 .as_bytes(),
             )?;
 
-            info!("written data to {}", file);
+            info!("written data to {file}");
         }
         Cli::StaticApi { ref dest } => {
             let dest = PathBuf::from(dest);
@@ -312,7 +310,7 @@ fn run() -> Result<(), Error> {
                 }
             }
             if let Email::Present(email) = person.email() {
-                println!("email: {}", email);
+                println!("email: {email}");
             }
             println!();
 
@@ -352,7 +350,7 @@ fn run() -> Result<(), Error> {
                 println!("  (none)");
             } else {
                 for (repo, perms) in bors_permissions {
-                    println!("  - {}", repo);
+                    println!("  - {repo}");
                     if perms.review() {
                         println!("    - review");
                     }
@@ -373,7 +371,7 @@ fn run() -> Result<(), Error> {
                 println!("  (none)");
             } else {
                 for key in other_permissions {
-                    println!("  - {}", key);
+                    println!("  - {key}");
                 }
             }
         }
@@ -399,7 +397,7 @@ fn run() -> Result<(), Error> {
                 }
                 println!("{} ({}):", team.name(), team.kind());
                 if let Some(parent) = team.subteam_of() {
-                    println!("  parent team: {}", parent);
+                    println!("  parent team: {parent}");
                 }
 
                 println!("  members: ");
@@ -418,7 +416,7 @@ fn run() -> Result<(), Error> {
             let mut emails = list.emails().iter().collect::<Vec<_>>();
             emails.sort();
             for email in emails {
-                println!("{}", email);
+                println!("{email}");
             }
         }
         Cli::DumpWebsite => {
@@ -456,7 +454,7 @@ fn run() -> Result<(), Error> {
                 .collect::<Vec<_>>();
             allowed.sort_unstable();
             for github_username in &allowed {
-                println!("{}", github_username);
+                println!("{github_username}");
             }
         }
         Cli::DumpIndividualAccess { group_by } => {
@@ -526,9 +524,9 @@ fn run() -> Result<(), Error> {
         Cli::Sync(opts) => {
             if let Err(err) = perform_sync(opts, data) {
                 // Display shows just the first element of the chain.
-                error!("failed: {}", err);
+                error!("failed: {err}");
                 for cause in err.chain().skip(1) {
-                    error!("caused by: {}", cause);
+                    error!("caused by: {cause}");
                 }
                 std::process::exit(1);
             }
diff --git a/src/permissions.rs b/src/permissions.rs
@@ -47,8 +47,8 @@ impl Permissions {
             result.push(boolean.to_string());
         }
         for repo in config.permissions_bors_repos() {
-            result.push(format!("bors.{}.review", repo));
-            result.push(format!("bors.{}.try", repo));
+            result.push(format!("bors.{repo}.review"));
+            result.push(format!("bors.{repo}.try"));
         }
 
         result
diff --git a/src/schema.rs b/src/schema.rs
@@ -96,7 +96,7 @@ impl Person {
         }
     }
 
-    pub(crate) fn email(&self) -> Email {
+    pub(crate) fn email(&self) -> Email<'_> {
         match &self.email {
             EmailField::Disabled(false) => Email::Disabled,
             EmailField::Disabled(true) => Email::Missing,
@@ -674,7 +674,7 @@ impl WebsiteData {
         self.repo.as_deref()
     }
 
-    pub(crate) fn discord(&self) -> Option<DiscordInvite> {
+    pub(crate) fn discord(&self) -> Option<DiscordInvite<'_>> {
         if let (Some(url), Some(channel)) = (&self.discord_invite, &self.discord_name) {
             Some(DiscordInvite {
                 url: url.as_ref(),
diff --git a/src/static_api.rs b/src/static_api.rs
@@ -485,7 +485,7 @@ impl<'a> Generator<'a> {
     where
         T: serde::Serialize + serde::de::DeserializeOwned + PartialEq,
     {
-        info!("writing API object {}...", path);
+        info!("writing API object {path}...");
         let json = serde_json::to_string_pretty(obj)?;
         self.write(path, json.as_bytes())?;
 
diff --git a/src/validate.rs b/src/validate.rs
@@ -89,7 +89,7 @@ pub(crate) fn validate(data: &Data, strict: bool, skip: &[&str]) -> Result<(), E
             return Err(err);
         } else {
             warn!("couldn't perform checks relying on the GitHub API, some errors will not be detected");
-            warn!("cause: {}", err);
+            warn!("cause: {err}");
         }
     } else {
         for check in GITHUB_CHECKS {
@@ -105,7 +105,7 @@ pub(crate) fn validate(data: &Data, strict: bool, skip: &[&str]) -> Result<(), E
     let zulip = ZulipApi::new();
     if let Err(err) = zulip.require_auth() {
         warn!("couldn't perform checks relying on the Zulip API, some errors will not be detected");
-        warn!("cause: {}", err);
+        warn!("cause: {err}");
     } else {
         for check in ZULIP_CHECKS {
             if skip.contains(&check.name) {
@@ -122,7 +122,7 @@ pub(crate) fn validate(data: &Data, strict: bool, skip: &[&str]) -> Result<(), E
         errors.dedup_by(|a, b| a == b);
 
         for err in &errors {
-            error!("validation error: {}", err);
+            error!("validation error: {err}");
         }
 
         bail!("{} validation errors found", errors.len());
@@ -603,7 +603,7 @@ fn validate_github_usernames(data: &Data, github: &GitHubApi, errors: &mut Vec<S
             }
             Ok(())
         }),
-        Err(err) => errors.push(format!("couldn't verify GitHub usernames: {}", err)),
+        Err(err) => errors.push(format!("couldn't verify GitHub usernames: {err}")),
     }
 }
 
@@ -682,14 +682,14 @@ fn validate_zulip_users(data: &Data, zulip: &ZulipApi, errors: &mut Vec<String>)
     let by_id = match zulip.get_users(false) {
         Ok(u) => u.iter().map(|u| u.user_id).collect::<HashSet<_>>(),
         Err(err) => {
-            errors.push(format!("couldn't verify Zulip users: {}", err));
+            errors.push(format!("couldn't verify Zulip users: {err}"));
             return;
         }
     };
     let zulip_groups = match data.zulip_groups() {
         Ok(zgs) => zgs,
         Err(err) => {
-            errors.push(format!("couldn't get all the Zulip groups: {}", err));
+            errors.push(format!("couldn't get all the Zulip groups: {err}"));
             return;
         }
     };

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ impl Data {`
`95`	`95`	`{`
`96`	`96`	`for entry in std::fs::read_dir(&dir).with_context(\|\| {`
`97`	`97`	`let dir = dir.as_ref().display();`
`98`		- format!("`load_dir` failed to read directory '{}'", dir)
	`98`	+ format!("`load_dir` failed to read directory '{dir}'")
`99`	`99`	`})? {`
`100`	`100`	`let path = entry?.path();`
`101`	`101`	`if nested && path.is_dir() {`
Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,7 @@ impl FromStr for DataSource {`
`164`	`164`	`path => {`
`165`	`165`	`let path = PathBuf::from(path);`
`166`	`166`	`if path.is_dir() {`
`167`		`- Ok(Self::Prebuilt {`
`168`		`- path: PathBuf::from(path),`
`169`		`- })`
	`167`	`+ Ok(Self::Prebuilt { path })`
`170`	`168`	`} else {`
`171`	`169`	`Err(`
`172`	`170`	"--src must be a path to an existing directory, `in-tree` or `production`"
`@@ -201,7 +199,7 @@ fn main() {`
`201`	`199`	`env.init();`
`202`	`200`
`203`	`201`	`if let Err(e) = run() {`
`204`		`- error!("{:?}", e);`
	`202`	`+ error!("{e:?}");`
`205`	`203`	`std::process::exit(1);`
`206`	`204`	`}`
`207`	`205`	`}`
`@@ -257,7 +255,7 @@ fn run() -> Result<(), Error> {`
`257`	`255`	`bail!("person already in the repo: {}", github_name);`
`258`	`256`	`}`
`259`	`257`
`260`		`- let file = format!("people/{}.toml", github_name);`
	`258`	`+ let file = format!("people/{github_name}.toml");`
`261`	`259`	`std::fs::write(`
`262`	`260`	`&file,`
`263`	`261`	`toml::to_string_pretty(&PersonToAdd {`
`@@ -278,7 +276,7 @@ fn run() -> Result<(), Error> {`
`278`	`276`	`.as_bytes(),`
`279`	`277`	`)?;`
`280`	`278`
`281`		`- info!("written data to {}", file);`
	`279`	`+ info!("written data to {file}");`
`282`	`280`	`}`
`283`	`281`	`Cli::StaticApi { ref dest } => {`
`284`	`282`	`let dest = PathBuf::from(dest);`
`@@ -312,7 +310,7 @@ fn run() -> Result<(), Error> {`
`312`	`310`	`}`
`313`	`311`	`}`
`314`	`312`	`if let Email::Present(email) = person.email() {`
`315`		`- println!("email: {}", email);`
	`313`	`+ println!("email: {email}");`
`316`	`314`	`}`
`317`	`315`	`println!();`
`318`	`316`
`@@ -352,7 +350,7 @@ fn run() -> Result<(), Error> {`
`352`	`350`	`println!(" (none)");`
`353`	`351`	`} else {`
`354`	`352`	`for (repo, perms) in bors_permissions {`
`355`		`- println!(" - {}", repo);`
	`353`	`+ println!(" - {repo}");`
`356`	`354`	`if perms.review() {`
`357`	`355`	`println!(" - review");`
`358`	`356`	`}`
`@@ -373,7 +371,7 @@ fn run() -> Result<(), Error> {`
`373`	`371`	`println!(" (none)");`
`374`	`372`	`} else {`
`375`	`373`	`for key in other_permissions {`
`376`		`- println!(" - {}", key);`
	`374`	`+ println!(" - {key}");`
`377`	`375`	`}`
`378`	`376`	`}`
`379`	`377`	`}`
`@@ -399,7 +397,7 @@ fn run() -> Result<(), Error> {`
`399`	`397`	`}`
`400`	`398`	`println!("{} ({}):", team.name(), team.kind());`
`401`	`399`	`if let Some(parent) = team.subteam_of() {`
`402`		`- println!(" parent team: {}", parent);`
	`400`	`+ println!(" parent team: {parent}");`
`403`	`401`	`}`
`404`	`402`
`405`	`403`	`println!(" members: ");`
`@@ -418,7 +416,7 @@ fn run() -> Result<(), Error> {`
`418`	`416`	`let mut emails = list.emails().iter().collect::<Vec<_>>();`
`419`	`417`	`emails.sort();`
`420`	`418`	`for email in emails {`
`421`		`- println!("{}", email);`
	`419`	`+ println!("{email}");`
`422`	`420`	`}`
`423`	`421`	`}`
`424`	`422`	`Cli::DumpWebsite => {`
`@@ -456,7 +454,7 @@ fn run() -> Result<(), Error> {`
`456`	`454`	`.collect::<Vec<_>>();`
`457`	`455`	`allowed.sort_unstable();`
`458`	`456`	`for github_username in &allowed {`
`459`		`- println!("{}", github_username);`
	`457`	`+ println!("{github_username}");`
`460`	`458`	`}`
`461`	`459`	`}`
`462`	`460`	`Cli::DumpIndividualAccess { group_by } => {`
`@@ -526,9 +524,9 @@ fn run() -> Result<(), Error> {`
`526`	`524`	`Cli::Sync(opts) => {`
`527`	`525`	`if let Err(err) = perform_sync(opts, data) {`
`528`	`526`	`// Display shows just the first element of the chain.`
`529`		`- error!("failed: {}", err);`
	`527`	`+ error!("failed: {err}");`
`530`	`528`	`for cause in err.chain().skip(1) {`
`531`		`- error!("caused by: {}", cause);`
	`529`	`+ error!("caused by: {cause}");`
`532`	`530`	`}`
`533`	`531`	`std::process::exit(1);`
`534`	`532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ impl Permissions {`
`47`	`47`	`result.push(boolean.to_string());`
`48`	`48`	`}`
`49`	`49`	`for repo in config.permissions_bors_repos() {`
`50`		`- result.push(format!("bors.{}.review", repo));`
`51`		`- result.push(format!("bors.{}.try", repo));`
	`50`	`+ result.push(format!("bors.{repo}.review"));`
	`51`	`+ result.push(format!("bors.{repo}.try"));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`result`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ impl Person {`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`		`- pub(crate) fn email(&self) -> Email {`
	`99`	`+ pub(crate) fn email(&self) -> Email<'_> {`
`100`	`100`	`match &self.email {`
`101`	`101`	`EmailField::Disabled(false) => Email::Disabled,`
`102`	`102`	`EmailField::Disabled(true) => Email::Missing,`
`@@ -674,7 +674,7 @@ impl WebsiteData {`
`674`	`674`	`self.repo.as_deref()`
`675`	`675`	`}`
`676`	`676`
`677`		`- pub(crate) fn discord(&self) -> Option<DiscordInvite> {`
	`677`	`+ pub(crate) fn discord(&self) -> Option<DiscordInvite<'_>> {`
`678`	`678`	`if let (Some(url), Some(channel)) = (&self.discord_invite, &self.discord_name) {`
`679`	`679`	`Some(DiscordInvite {`
`680`	`680`	`url: url.as_ref(),`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ impl<'a> Generator<'a> {`
`485`	`485`	`where`
`486`	`486`	`T: serde::Serialize + serde::de::DeserializeOwned + PartialEq,`
`487`	`487`	`{`
`488`		`- info!("writing API object {}...", path);`
	`488`	`+ info!("writing API object {path}...");`
`489`	`489`	`let json = serde_json::to_string_pretty(obj)?;`
`490`	`490`	`self.write(path, json.as_bytes())?;`
`491`	`491`