summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2018-11-27 14:45:17 +0100
committerPietro Albini <pietro@pietroalbini.org>2018-11-27 14:45:17 +0100
commitf0a4f09e285f5df03cc672d8fd723196c8074888 (patch)
tree38497b92f921ff4e8b73d34dde36fcbe89f5bd32 /src
parent56329833966d8d6067398ed4e6e47cad4b221e05 (diff)
run rustfmt
Diffstat (limited to 'src')
-rw-r--r--src/data.rs2
-rw-r--r--src/main.rs24
-rw-r--r--src/validate.rs47
3 files changed, 50 insertions, 23 deletions
diff --git a/src/data.rs b/src/data.rs
index 061badb..ae8a0eb 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -1,4 +1,4 @@
-use crate::schema::{Person, Team, List};
+use crate::schema::{List, Person, Team};
use failure::{Error, ResultExt};
use serde::Deserialize;
use std::collections::HashMap;
diff --git a/src/main.rs b/src/main.rs
index de20415..540c038 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,7 @@ mod sync;
mod validate;
use crate::data::Data;
-use failure::{Error, err_msg};
+use failure::{err_msg, Error};
use structopt::StructOpt;
#[derive(structopt::StructOpt)]
@@ -15,13 +15,9 @@ enum Cli {
#[structopt(name = "sync", help = "synchronize the configuration")]
Sync,
#[structopt(name = "dump-team", help = "print the members of a team")]
- DumpTeam {
- name: String,
- },
+ DumpTeam { name: String },
#[structopt(name = "dump-list", help = "print all the emails in a list")]
- DumpList {
- name: String,
- },
+ DumpList { name: String },
}
fn main() {
@@ -50,11 +46,15 @@ fn run() -> Result<(), Error> {
let leads = team.leads();
for member in team.members(&data)? {
- println!("{}{}", member, if leads.contains(member) {
- " (lead)"
- } else {
- ""
- });
+ println!(
+ "{}{}",
+ member,
+ if leads.contains(member) {
+ " (lead)"
+ } else {
+ ""
+ }
+ );
}
}
Cli::DumpList { ref name } => {
diff --git a/src/validate.rs b/src/validate.rs
index c1680ce..a114ebc 100644
--- a/src/validate.rs
+++ b/src/validate.rs
@@ -1,5 +1,5 @@
use crate::data::Data;
-use failure::{Error, bail};
+use failure::{bail, Error};
use regex::Regex;
use std::collections::HashSet;
@@ -34,7 +34,11 @@ fn validate_team_leads(data: &Data, errors: &mut Vec<String>) {
let members = team.members(data)?;
wrapper(team.leads().iter(), errors, |lead, _| {
if !members.contains(lead) {
- bail!("`{}` leads team `{}`, but is not a member of it", lead, team.name());
+ bail!(
+ "`{}` leads team `{}`, but is not a member of it",
+ lead,
+ team.name()
+ );
}
Ok(())
});
@@ -47,7 +51,11 @@ fn validate_team_members(data: &Data, errors: &mut Vec<String>) {
wrapper(data.teams(), errors, |team, errors| {
wrapper(team.members(data)?.iter(), errors, |member, _| {
if data.person(member).is_none() {
- bail!("person `{}` is member of team `{}` but doesn't exist", member, team.name());
+ bail!(
+ "person `{}` is member of team `{}` but doesn't exist",
+ member,
+ team.name()
+ );
}
Ok(())
});
@@ -67,9 +75,13 @@ fn validate_inactive_members(data: &Data, errors: &mut Vec<String>) {
});
let all_members = data.people().map(|p| p.github()).collect::<HashSet<_>>();
- wrapper(all_members.difference(&active_members), errors, |person, _| {
- bail!("person `{}` is not a member of any team", person);
- });
+ wrapper(
+ all_members.difference(&active_members),
+ errors,
+ |person, _| {
+ bail!("person `{}` is not a member of any team", person);
+ },
+ );
}
/// Ensure every member of a team with a mailing list has an email address
@@ -81,7 +93,10 @@ fn validate_list_email_addresses(data: &Data, errors: &mut Vec<String>) {
wrapper(team.members(data)?.iter(), errors, |member, _| {
let member = data.person(member).unwrap();
if member.email().is_none() {
- bail!("person `{}` is a member of a mailing list but has no email address", member.github());
+ bail!(
+ "person `{}` is a member of a mailing list but has no email address",
+ member.github()
+ );
}
Ok(())
});
@@ -95,7 +110,11 @@ fn validate_list_extra_people(data: &Data, errors: &mut Vec<String>) {
wrapper(team.raw_lists().iter(), errors, |list, _| {
for person in &list.extra_people {
if data.person(person).is_none() {
- bail!("person `{}` does not exist (in list `{}`)", person, list.address);
+ bail!(
+ "person `{}` does not exist (in list `{}`)",
+ person,
+ list.address
+ );
}
}
Ok(())
@@ -110,7 +129,11 @@ fn validate_list_extra_teams(data: &Data, errors: &mut Vec<String>) {
wrapper(team.raw_lists().iter(), errors, |list, _| {
for list_team in &list.extra_teams {
if data.team(list_team).is_none() {
- bail!("team `{}` does not exist (in list `{}`)", list_team, list.address);
+ bail!(
+ "team `{}` does not exist (in list `{}`)",
+ list_team,
+ list.address
+ );
}
}
Ok(())
@@ -126,7 +149,11 @@ fn validate_discord_name(data: &Data, errors: &mut Vec<String>) {
wrapper(data.people(), errors, |person, _| {
if let Some(name) = person.discord() {
if !name_re.is_match(name) {
- bail!("user `{}` has an invalid discord name: {}", person.github(), name);
+ bail!(
+ "user `{}` has an invalid discord name: {}",
+ person.github(),
+ name
+ );
}
}
Ok(())