run rustfmt and clippy

5 files changed, 35 insertions, 23 deletions

diff --git a/src/data.rs b/src/data.rs
index a93fc4b..42fc700 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -1,4 +1,4 @@
-use crate::schema::{List, Person, Team, Config};
+use crate::schema::{Config, List, Person, Team};
 use failure::{Error, ResultExt};
 use serde::Deserialize;
 use std::collections::HashMap;
@@ -87,8 +87,8 @@ 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()))?;
+    let content =
+        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)
diff --git a/src/main.rs b/src/main.rs
index 7a9e009..1f0592e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,9 @@
+#![allow(clippy::new_ret_no_self)]
+
 mod data;
 mod schema;
-mod validate;
 mod static_api;
+mod validate;
 
 use crate::data::Data;
 use failure::{err_msg, Error};
diff --git a/src/schema.rs b/src/schema.rs
index c8f6006..96b1217 100644
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -249,7 +249,10 @@ impl WebsiteData {
 
     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(), channel: channel.as_ref() })
+            Some(DiscordInvite {
+                url: url.as_ref(),
+                channel: channel.as_ref(),
+            })
         } else {
             None
         }
diff --git a/src/static_api.rs b/src/static_api.rs
index 164cfbe..33bac41 100644
--- a/src/static_api.rs
+++ b/src/static_api.rs
@@ -1,9 +1,9 @@
 use crate::data::Data;
-use rust_team_data::v1;
 use failure::Error;
+use indexmap::IndexMap;
 use log::info;
+use rust_team_data::v1;
 use std::path::Path;
-use indexmap::IndexMap;
 
 pub(crate) struct Generator<'a> {
     dest: &'a Path,
@@ -56,7 +56,7 @@ impl<'a> Generator<'a> {
                 website_data: team.website_data().map(|ws| v1::TeamWebsite {
                     name: ws.name().into(),
                     description: ws.description().into(),
-                    page: ws.page().unwrap_or(team.name()).into(),
+                    page: ws.page().unwrap_or_else(|| team.name()).into(),
                     email: ws.email().map(|e| e.into()),
                     repo: ws.repo().map(|e| e.into()),
                     discord: ws.discord().map(|i| v1::DiscordInvite {
@@ -72,10 +72,7 @@ impl<'a> Generator<'a> {
         }
 
         teams.sort_keys();
-        self.add(
-            "v1/teams.json",
-            &v1::Teams { teams },
-        )?;
+        self.add("v1/teams.json", &v1::Teams { teams })?;
         Ok(())
     }
 
@@ -85,17 +82,17 @@ impl<'a> Generator<'a> {
         for list in self.data.lists()?.values() {
             let mut members = list.emails().to_vec();
             members.sort();
-            lists.insert(list.address().to_string(), v1::List {
-                address: list.address().to_string(),
-                members,
-            });
+            lists.insert(
+                list.address().to_string(),
+                v1::List {
+                    address: list.address().to_string(),
+                    members,
+                },
+            );
         }
 
         lists.sort_keys();
-        self.add(
-            "v1/lists.json",
-            &v1::Lists { lists },
-        )?;
+        self.add("v1/lists.json", &v1::Lists { lists })?;
         Ok(())
     }
 
diff --git a/src/validate.rs b/src/validate.rs
index 8b3208e..6606064 100644
--- a/src/validate.rs
+++ b/src/validate.rs
@@ -37,8 +37,14 @@ pub(crate) fn validate(data: &Data) -> Result<(), Error> {
 fn validate_wg_names(data: &Data, errors: &mut Vec<String>) {
     wrapper(data.teams(), errors, |team, _| {
         match (team.is_wg() == team.name().starts_with("wg-"), team.is_wg()) {
-            (false, true) => bail!("working group `{}`'s name doesn't start with wg-", team.name()),
-            (false, false) => bail!("team `{}` seems like a working group but has `wg = false`", team.name()),
+            (false, true) => bail!(
+                "working group `{}`'s name doesn't start with wg-",
+                team.name()
+            ),
+            (false, false) => bail!(
+                "team `{}` seems like a working group but has `wg = false`",
+                team.name()
+            ),
             (true, _) => {}
         }
         Ok(())
@@ -50,7 +56,11 @@ fn validate_subteam_of(data: &Data, errors: &mut Vec<String>) {
     let team_names: HashSet<_> = data.teams().map(|t| t.name()).collect();
     wrapper(data.teams(), errors, |team, _| {
         if let Some(subteam_of) = team.subteam_of() {
-            ensure!(team_names.contains(subteam_of), "team `{}` doesn't exist", subteam_of);
+            ensure!(
+                team_names.contains(subteam_of),
+                "team `{}` doesn't exist",
+                subteam_of
+            );
         }
         Ok(())
     });