Skip to content

Simpler way of deduplicating code in duplicate checks #2702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
steffahn wants to merge 2 commits into from
Closed

Simpler way of deduplicating code in duplicate checks #2702

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf3b182
Simpler way of deduplicating code in duplicate checks
steffahn Aug 21, 2026
948ba3f
shorten chain expression for duplicate member+alumni check
steffahn Aug 21, 2026
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
42 changes: 5 additions & 37 deletions src/validate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use log::{error, warn};
use regex::Regex;
use std::collections::hash_map::{Entry, HashMap};
use std::collections::{BTreeSet, HashSet};
use std::iter;

macro_rules! checks {
($($f:ident,)*) => {
Expand Down Expand Up @@ -290,7 +291,7 @@ where
if !duplicates.is_empty() {
let dup_list: Vec<&str> = duplicates.into_iter().collect();
bail!(
"team `{}` has duplicate {}: {}",
"team `{}` has {}: {}",
team_name,
label,
dup_list.join(", ")
Expand All @@ -307,50 +308,17 @@ fn validate_duplicate_team_entries(data: &Data, errors: &mut Vec<String>) {
// Check leads for duplicates
if let Err(e) = check_duplicates(
team.name(),
"leads",
"duplicate leads",
team.explicit_leads().iter().map(|s| s.as_str()),
) {
errors.push(e.to_string());
}

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

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

// Check members + alumni for duplicates
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())),
"duplicates within or between members and/or alumni",
iter::chain(team.explicit_members(), team.explicit_alumni()).map(|a| a.github.as_str()),
) {
errors.push(e.to_string());
}
Expand Down