Merge pull request #958 from tshepang/clippy

cargo clippy --fix

Author: rylev

src/check_synced.rs

@@ -104,7 +104,7 @@ pub(crate) fn check_github(data: &Data) -> Result<(), failure::Error> {
         .collect::<Result<HashMap<_, _>, failure::Error>>()?;
 
     for team in data.teams() {
-        let local_teams = team.github_teams(&data)?;
+        let local_teams = team.github_teams(data)?;
         let local_team = local_teams.into_iter().find(|t| t.org == "rust-lang");
         let local_team = match local_team {
             Some(t) => t,

src/data.rs

@@ -74,7 +74,7 @@ impl Data {
                 self.load_dir(&path, false, f.clone())?;
             } else if !nested && path.is_file() && path.extension() == Some(OsStr::new("toml")) {
                 fn dir(path: &PathBuf) -> Option<&str> {
-                    Some(path.parent()?.file_name()?.to_str()?)
+                    path.parent()?.file_name()?.to_str()
                 }
                 f(self, dir(&path).unwrap(), load_file(&path)?)?;
             }
@@ -147,7 +147,7 @@ impl Data {
     }
 
     pub(crate) fn repos(&self) -> impl Iterator<Item = &Repo> {
-        self.repos.iter().map(|(_, repo)| repo)
+        self.repos.values()
     }
 
     pub(crate) fn archived_teams(&self) -> impl Iterator<Item = &Team> {
@@ -157,7 +157,7 @@ impl Data {
 
 fn load_file<T: for<'de> Deserialize<'de>>(path: &Path) -> Result<T, Error> {
     let content =
-        std::fs::read(&path).with_context(|_| format!("failed to read {}", path.display()))?;
+        std::fs::read(path).with_context(|_| format!("failed to read {}", path.display()))?;
     let parsed = toml::from_slice(&content)
         .with_context(|_| format!("failed to parse {}", path.display()))?;
     Ok(parsed)

src/github.rs

@@ -291,7 +291,7 @@ impl GitHubApi {
 }
 
 fn user_node_id(id: usize) -> String {
-    base64::encode(&format!("04:User{}", id))
+    base64::encode(format!("04:User{}", id))
 }
 
 #[derive(Debug, serde::Deserialize)]

src/main.rs

@@ -216,7 +216,7 @@ fn run() -> Result<(), Error> {
                     let name = switch(team.name);
                     bots.push(name.to_owned());
                 } else if team.name == "bots" {
-                    bots.extend(BOTS.into_iter().map(|&s| switch(s.to_owned())));
+                    bots.extend(BOTS.iter().map(|&s| switch(s.to_owned())));
                 } else {
                     teams.insert(team.name, team.permission.as_toml().to_owned());
                 }
@@ -251,7 +251,7 @@ fn run() -> Result<(), Error> {
                 branch: branches,
             };
             let file = format!("repos/{org}/{name}.toml");
-            std::fs::write(&file, toml::to_string_pretty(&repo)?.as_bytes())?;
+            std::fs::write(file, toml::to_string_pretty(&repo)?.as_bytes())?;
         }
         Cli::StaticApi { ref dest } => {
             let dest = PathBuf::from(dest);

src/static_api.rs

@@ -14,9 +14,9 @@ pub(crate) struct Generator<'a> {
 impl<'a> Generator<'a> {
     pub(crate) fn new(dest: &'a Path, data: &'a Data) -> Result<Generator<'a>, Error> {
         if dest.is_dir() {
-            std::fs::remove_dir_all(&dest)?;
+            std::fs::remove_dir_all(dest)?;
         }
-        std::fs::create_dir_all(&dest)?;
+        std::fs::create_dir_all(dest)?;
 
         Ok(Generator { dest, data })
     }
@@ -94,7 +94,7 @@ impl<'a> Generator<'a> {
                         }
                     })
                     .collect(),
-                branch_protections: branch_protections,
+                branch_protections,
             };
 
             self.add(&format!("v1/repos/{}.json", r.name), &repo)?;

src/validate.rs

@@ -477,7 +477,7 @@ fn validate_github_teams(data: &Data, errors: &mut Vec<String>) {
             team.github_teams(data)?.into_iter(),
             errors,
             |gh_team, _| {
-                if !allowed.contains(&*gh_team.org) {
+                if !allowed.contains(gh_team.org) {
                     bail!(
                         "GitHub organization `{}` isn't allowed (in team `{}`)",
                         gh_team.org,

src/zulip.rs

@@ -76,7 +76,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))