From 1c60a98d9e5b7457b548f3e96b1e06827c825bce Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Mon, 17 Feb 2025 19:38:47 -0800
Subject: [PATCH] Recursively include all subteams of all kinds

This changes it so that the subteam flattening logic will look at all
team kinds, not just "Team". This fixes it so that
https://www.rust-lang.org/governance/teams/launching-pad
will show all the sub-groups of embedded for example.
---
 src/teams.rs | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/teams.rs b/src/teams.rs
index 26d7d72a..a7179205 100644
--- a/src/teams.rs
+++ b/src/teams.rs
@@ -116,35 +116,27 @@ impl Data {
         let superteams: HashMap<_, _> = self
             .teams
             .iter()
-            .filter(|team| matches!(team.kind, TeamKind::Team))
             .filter_map(|team| Some((team.name.clone(), team.subteam_of.clone()?)))
             .collect();
 
         self.teams
             .into_iter()
-            // The leadership-council page should show just the
-            // leadership-council, not everything underneath it.
-            .filter(|_| main_team.name != "leadership-council")
             .filter(|team| team.website_data.is_some())
             .filter(|team| {
                 // For teams find not only direct subteams but also transitive ones.
-                if let TeamKind::Team = team.kind {
-                    let mut team = &team.name;
+                let mut team = &team.name;
 
-                    // The graph of teams is guaranteed to be acyclic by the CI script of
-                    // the team repository. Therefore this loop has to terminate eventually.
-                    while let Some(superteam) = superteams.get(team) {
-                        if superteam == &main_team.name {
-                            return true;
-                        }
-
-                        team = superteam;
+                // The graph of teams is guaranteed to be acyclic by the CI script of
+                // the team repository. Therefore this loop has to terminate eventually.
+                while let Some(superteam) = superteams.get(team) {
+                    if superteam == &main_team.name {
+                        return true;
                     }
 
-                    return false;
+                    team = superteam;
                 }
 
-                team.subteam_of.as_ref() == Some(&main_team.name)
+                false
             })
             .for_each(|team| match team.kind {
                 TeamKind::Team => raw_subteams.push(team),