Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions src/validate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -322,23 +322,22 @@ fn validate_duplicate_team_entries(data: &Data, errors: &mut Vec<String>) {
errors.push(e.to_string());
}

let alumni = || {
team.explicit_alumni()
.iter()
.map(|alum| alum.github.as_str())
};

// Check alumni for duplicates
if let Err(e) = check_duplicates(
team.name(),
"alumni",
team.explicit_alumni().iter().map(|a| a.github.as_str()),
) {
if let Err(e) = check_duplicates(team.name(), "alumni", alumni()) {
errors.push(e.to_string());
}

// Check leads + alumni for duplicates
if let Err(e) = check_duplicates(
team.name(),
"leads + alumni",
team.explicit_alumni()
.iter()
.map(|a| a.github.as_str())
.chain(team.explicit_leads().iter().map(|s| s.as_str())),
alumni().chain(team.explicit_leads().iter().map(|s| s.as_str())),
) {
errors.push(e.to_string());
}
Expand All @@ -347,10 +346,7 @@ fn validate_duplicate_team_entries(data: &Data, errors: &mut Vec<String>) {
if let Err(e) = check_duplicates(
team.name(),
"members + alumni",
team.explicit_alumni()
.iter()
.map(|a| a.github.as_str())
.chain(team.explicit_members().iter().map(|s| s.github.as_str())),
alumni().chain(team.explicit_members().iter().map(|s| s.github.as_str())),
) {
errors.push(e.to_string());
}
Expand Down