diff options
| -rw-r--r-- | people/XAMPPRocky.toml | 4 | ||||
| -rw-r--r-- | people/v-thakkar.toml (renamed from people/nerdyvaishali.toml) | 2 | ||||
| -rw-r--r-- | rust_team_data/src/v1.rs | 3 | ||||
| -rw-r--r-- | src/schema.rs | 8 | ||||
| -rw-r--r-- | src/static_api.rs | 2 | ||||
| -rw-r--r-- | src/validate.rs | 14 | ||||
| -rw-r--r-- | teams/community-content.toml | 3 | ||||
| -rw-r--r-- | teams/community-events.toml | 4 | ||||
| -rw-r--r-- | teams/community-rustbridge.toml | 3 | ||||
| -rw-r--r-- | teams/community-survey.toml | 6 | ||||
| -rw-r--r-- | teams/community.toml | 10 | ||||
| -rw-r--r-- | teams/compiler-contributors.toml | 2 | ||||
| -rw-r--r-- | teams/crates-io.toml | 19 | ||||
| -rw-r--r-- | teams/icebreakers-llvm.toml | 10 | ||||
| -rw-r--r-- | teams/infra-admins.toml | 3 | ||||
| -rw-r--r-- | teams/infra.toml | 2 | ||||
| -rw-r--r-- | teams/libs.toml | 13 | ||||
| -rw-r--r-- | teams/release.toml | 1 | ||||
| -rw-r--r-- | teams/security.toml | 10 | ||||
| -rw-r--r-- | teams/wg-embedded.toml | 2 | ||||
| -rw-r--r-- | teams/wg-grammar.toml | 3 | ||||
| -rw-r--r-- | teams/wg-localization.toml | 1 | ||||
| -rw-r--r-- | teams/wg-polonius.toml | 2 |
23 files changed, 92 insertions, 35 deletions
diff --git a/people/XAMPPRocky.toml b/people/XAMPPRocky.toml index 4ba6fc1..eb842ca 100644 --- a/people/XAMPPRocky.toml +++ b/people/XAMPPRocky.toml @@ -1,4 +1,4 @@ -name = "Aaron Power" +name = "Erin Power" github = "XAMPPRocky" github-id = 4464295 -email = "theaaronepower@gmail.com" +email = "xampprocky@icloud.com" diff --git a/people/nerdyvaishali.toml b/people/v-thakkar.toml index bbda1b3..84f87a3 100644 --- a/people/nerdyvaishali.toml +++ b/people/v-thakkar.toml @@ -1,4 +1,4 @@ name = "vaishali Thakkar" -github = "nerdyvaishali" +github = "v-thakkar" github-id = 7105009 email = false diff --git a/rust_team_data/src/v1.rs b/rust_team_data/src/v1.rs index e970d0d..91a92c8 100644 --- a/rust_team_data/src/v1.rs +++ b/rust_team_data/src/v1.rs @@ -8,6 +8,9 @@ pub static BASE_URL: &str = "https://team-api.infra.rust-lang.org/v1"; pub enum TeamKind { Team, WorkingGroup, + MarkerTeam, + #[serde(other)] + Unknown, } #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/src/schema.rs b/src/schema.rs index 0a25332..aa4bb60 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -109,6 +109,8 @@ pub(crate) struct Team { name: String, #[serde(default = "default_false")] wg: bool, + #[serde(default = "default_false")] + marker_team: bool, subteam_of: Option<String>, people: TeamPeople, #[serde(default)] @@ -129,6 +131,10 @@ impl Team { self.wg } + pub(crate) fn is_marker_team(&self) -> bool { + self.marker_team + } + pub(crate) fn subteam_of(&self) -> Option<&str> { self.subteam_of.as_ref().map(|s| s.as_str()) } @@ -160,7 +166,7 @@ impl Team { } if self.people.include_all_team_members { for team in data.teams() { - if team.is_wg() || team.name == self.name { + if team.is_wg() || team.is_marker_team() || team.name == self.name { continue; } for member in team.members(data)? { diff --git a/src/static_api.rs b/src/static_api.rs index d360927..d424d9b 100644 --- a/src/static_api.rs +++ b/src/static_api.rs @@ -55,6 +55,8 @@ impl<'a> Generator<'a> { name: team.name().into(), kind: if team.is_wg() { v1::TeamKind::WorkingGroup + } else if team.is_marker_team() { + v1::TeamKind::MarkerTeam } else { v1::TeamKind::Team }, diff --git a/src/validate.rs b/src/validate.rs index c6e2657..0ef2e40 100644 --- a/src/validate.rs +++ b/src/validate.rs @@ -24,6 +24,7 @@ static CHECKS: &[fn(&Data, &mut Vec<String>)] = &[ validate_rfcbot_exclude_members, validate_team_names, validate_github_teams, + validate_marker_team, ]; static GITHUB_CHECKS: &[fn(&Data, &GitHubApi, &mut Vec<String>)] = &[validate_github_usernames]; @@ -432,6 +433,19 @@ fn validate_github_usernames(data: &Data, github: &GitHubApi, errors: &mut Vec<S } } +/// Ensure teams are not working group and marker team at the same time +fn validate_marker_team(data: &Data, errors: &mut Vec<String>) { + wrapper(data.teams(), errors, |team, _| { + if team.is_wg() && team.is_marker_team() { + bail!( + "`{}` is a working group and marker team at the same time", + team.name() + ); + } + Ok(()) + }); +} + fn wrapper<T, I, F>(iter: I, errors: &mut Vec<String>, mut func: F) where I: Iterator<Item = T>, diff --git a/teams/community-content.toml b/teams/community-content.toml index ecc259f..365230a 100644 --- a/teams/community-content.toml +++ b/teams/community-content.toml @@ -16,3 +16,6 @@ description = "Helping support community content collection and development." repo = "https://github.com/rust-community/content-team" discord-invite = "https://discord.gg/b7a22kw" discord-name = "#content" + +[github] +orgs = ["rust-lang"] diff --git a/teams/community-events.toml b/teams/community-events.toml index 0b3724c..dd60724 100644 --- a/teams/community-events.toml +++ b/teams/community-events.toml @@ -10,6 +10,7 @@ members = [ "flaki", "badboy", "Manishearth", + "JohnTitor", ] [website] @@ -18,3 +19,6 @@ description = "Supporting community events with knowledge and resources." repo = "https://github.com/rust-community/events-team" discord-invite = "https://discord.gg/cj5HMXA" discord-name = "#events" + +[github] +orgs = ["rust-lang"] diff --git a/teams/community-rustbridge.toml b/teams/community-rustbridge.toml index 2089c98..5a9f127 100644 --- a/teams/community-rustbridge.toml +++ b/teams/community-rustbridge.toml @@ -19,3 +19,6 @@ description = "An inclusive educational initiative focused on bringing underrepr repo = "https://github.com/rustbridge/team" discord-invite = "https://discord.gg/cj5HMXA" discord-name = "#rustbridge" + +[github] +orgs = ["rust-lang"] diff --git a/teams/community-survey.toml b/teams/community-survey.toml index c9f13e5..502d5a9 100644 --- a/teams/community-survey.toml +++ b/teams/community-survey.toml @@ -2,12 +2,14 @@ name = "community-survey" subteam-of = "community" [people] -leads = ["jonathandturner"] +leads = ["Manishearth"] members = [ - "jonathandturner", "Manishearth", ] [website] name = "Survey team" description = "Running, analysing, and presenting the community survey." + +[github] +orgs = ["rust-lang"] diff --git a/teams/community.toml b/teams/community.toml index 58519b7..d6c7e49 100644 --- a/teams/community.toml +++ b/teams/community.toml @@ -1,16 +1,17 @@ name = "community" [people] -leads = ["ashleygwilliams"] +leads = [] members = [ "skade", "Manishearth", "sebasmagri", - "badboy", "ashleygwilliams", + "badboy", "fmoko", "technetos", "jonathandturner", + "JohnTitor", ] [website] @@ -21,6 +22,9 @@ repo = "https://github.com/rust-community/team" discord-invite = "https://discord.gg/KskHZGT" discord-name = "#community-team" +[github] +orgs = ["rust-lang"] + [[lists]] address = "community@rust-lang.org" extra-teams = [ @@ -63,6 +67,7 @@ extra-emails = [ address = "rustbridge@rust-lang.org" include-team-members = false extra-people = [ + "fmoko", "ashleygwilliams", "arshiamufti", ] @@ -76,4 +81,5 @@ extra-people = [ "Dylan-DPC", "spastorino", "skade", + "XAMPPRocky", ] diff --git a/teams/compiler-contributors.toml b/teams/compiler-contributors.toml index 4c6c673..e48219d 100644 --- a/teams/compiler-contributors.toml +++ b/teams/compiler-contributors.toml @@ -4,9 +4,11 @@ subteam-of = "compiler" [people] leads = [] members = [ + "Centril", "davidtwco", "flodiebold", "lqd", + "Mark-Simulacrum", "matklad", "matthewjasper", "nikic", diff --git a/teams/crates-io.toml b/teams/crates-io.toml index e98ad6f..f8ce6af 100644 --- a/teams/crates-io.toml +++ b/teams/crates-io.toml @@ -32,17 +32,10 @@ discord-invite = "https://discord.gg/Rbq8W5K" discord-name = "#crates-io" [[lists]] -address = "help@crates.io" -include-team-members = false -extra-people = [ - "carols10cents", - "ashleygwilliams", - "sgrif", - "pietroalbini", -] +address = "crates-io@rust-lang.org" [[lists]] -address = "crates-io@rust-lang.org" +address = "help@crates.io" include-team-members = false extra-people = [ "carols10cents", @@ -50,11 +43,3 @@ extra-people = [ "sgrif", "pietroalbini", ] - -[[lists]] -address = "admin@crates.io" -include-team-members = false -extra-people = [ - "aturon", - "alexcrichton", -] diff --git a/teams/icebreakers-llvm.toml b/teams/icebreakers-llvm.toml new file mode 100644 index 0000000..60c59e6 --- /dev/null +++ b/teams/icebreakers-llvm.toml @@ -0,0 +1,10 @@ +name = "icebreakers-llvm" +marker-team = true + +[people] +leads = [] +members = [ + "nagisa", + "nikic", + "rkruppe", +] diff --git a/teams/infra-admins.toml b/teams/infra-admins.toml index d49bf2d..2653d12 100644 --- a/teams/infra-admins.toml +++ b/teams/infra-admins.toml @@ -13,6 +13,9 @@ members = [ address = "admin@rust-lang.org" [[lists]] +address = "admin@crates.io" + +[[lists]] address = "rust-key@rust-lang.org" [[lists]] diff --git a/teams/infra.toml b/teams/infra.toml index d26f38b..c076fed 100644 --- a/teams/infra.toml +++ b/teams/infra.toml @@ -2,7 +2,7 @@ name = "infra" subteam-of = "operations" [people] -leads = ["aidanhs"] +leads = ["aidanhs", "pietroalbini"] members = [ "Mark-Simulacrum", "TimNN", diff --git a/teams/libs.toml b/teams/libs.toml index 258679f..bc8f04c 100644 --- a/teams/libs.toml +++ b/teams/libs.toml @@ -3,18 +3,20 @@ name = "libs" [people] leads = ["alexcrichton"] members = [ - "alexcrichton", - "sfackler", + "Amanieu", "BurntSushi", "Kimundi", + "KodrAus", "SimonSapin", + "alexcrichton", "dtolnay", - "aturon", - "KodrAus", + "sfackler", "withoutboats", - "Amanieu", ] +[github] +orgs = ["rust-lang", "rust-lang-nursery"] + [permissions] perf = true crater = true @@ -30,7 +32,6 @@ ping = "rust-lang/libs" exclude-members = [ "BurntSushi", "KodrAus", - "aturon", ] [website] diff --git a/teams/release.toml b/teams/release.toml index 5085985..5ea0c02 100644 --- a/teams/release.toml +++ b/teams/release.toml @@ -13,6 +13,7 @@ members = [ "sgrif", "jonas-schievink", "XAMPPRocky", + "tmandry", ] [permissions] diff --git a/teams/security.toml b/teams/security.toml index 0cf4be9..2a282cb 100644 --- a/teams/security.toml +++ b/teams/security.toml @@ -4,10 +4,20 @@ name = "security" leads = [] members = [ "alexcrichton", + "cuviper", "nikomatsakis", "pietroalbini", "steveklabnik", ] +[github] +orgs = ["rust-lang"] + +[website] +name = "Security team" +description = "Triaging and responding to incoming vulnerability reports" +email = "security@rust-lang.org" +repo = "https://github.com/rust-lang/security-team" + [[lists]] address = "security@rust-lang.org" diff --git a/teams/wg-embedded.toml b/teams/wg-embedded.toml index 5d1f963..622137e 100644 --- a/teams/wg-embedded.toml +++ b/teams/wg-embedded.toml @@ -21,7 +21,6 @@ members = [ "jcsoo", "korken89", "nastevens", - "nerdyvaishali", "paoloteti", "parched", "pftbest", @@ -32,6 +31,7 @@ members = [ "sekineh", "thejpster", "therealprof", + "v-thakkar", "wizofe", ] diff --git a/teams/wg-grammar.toml b/teams/wg-grammar.toml index 75c57c2..92657ef 100644 --- a/teams/wg-grammar.toml +++ b/teams/wg-grammar.toml @@ -3,8 +3,9 @@ subteam-of = "lang" wg = true [people] -leads = ["Centril", "qmx"] +leads = ["eddyb", "qmx"] members = [ + "eddyb", "CAD97", "Centril", "qmx", diff --git a/teams/wg-localization.toml b/teams/wg-localization.toml index 1c80b4c..b4464a9 100644 --- a/teams/wg-localization.toml +++ b/teams/wg-localization.toml @@ -7,6 +7,7 @@ leads = ["sebasmagri"] members = [ "sebasmagri", "Manishearth", + "JohnTitor", ] [website] diff --git a/teams/wg-polonius.toml b/teams/wg-polonius.toml index 64b7aa0..e4735fe 100644 --- a/teams/wg-polonius.toml +++ b/teams/wg-polonius.toml @@ -4,7 +4,7 @@ wg = true [people] leads = ["lqd", "nikomatsakis"] -members = ["lqd", "nikomatsakis", "albins"] +members = ["lqd", "nikomatsakis", "albins", "matthewjasper"] [website] name = "Polonius" |