From 1d5298acdc221eb266b8a567c3c41a94774d8d27 Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)"
 <193874+carols10cents@users.noreply.github.com>
Date: Fri, 26 Apr 2024 07:55:39 -0400
Subject: [PATCH] Implement RFC#3595 Moving crates.io under devtools (#1439)

This implements [RFC#3595], which entails:

- Moving the crates.io team to be a subteam of devtools
- Removing @carols10cents from Leadership Council

[RFC#3595]: https://github.com/rust-lang/rfcs/pull/3595
---
 teams/crates-io.toml          | 2 +-
 teams/devtools.toml           | 1 +
 teams/leadership-council.toml | 7 +------
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/teams/crates-io.toml b/teams/crates-io.toml
index 71d5d96eb..14eaeaded 100644
--- a/teams/crates-io.toml
+++ b/teams/crates-io.toml
@@ -1,5 +1,5 @@
 name = "crates-io"
-top-level = true
+subteam-of = "devtools"
 
 [people]
 leads = ["jtgeibel", "Turbo87"]
diff --git a/teams/devtools.toml b/teams/devtools.toml
index 7d7ee4ace..32b9a55de 100644
--- a/teams/devtools.toml
+++ b/teams/devtools.toml
@@ -52,6 +52,7 @@ extra-teams = [
     "rustfmt",
     "rustup",
     "wg-bindgen",
+    "crates-io",
 ]
 extra-people = ["spacekookie"]
 
diff --git a/teams/leadership-council.toml b/teams/leadership-council.toml
index da1e6cce7..4294ea54c 100644
--- a/teams/leadership-council.toml
+++ b/teams/leadership-council.toml
@@ -3,7 +3,6 @@ name = "leadership-council"
 [people]
 leads = []
 members = [
-    { github = "carols10cents", roles = ["council-rep-crates-io"] },
     { github = "eholk", roles = ["council-rep-compiler"] },
     { github = "ehuss", roles = ["council-rep-devtools"] },
     { github = "jackh726", roles = ["council-rep-lang"] },
@@ -12,7 +11,7 @@ members = [
     { github = "m-ou-se", roles = ["council-rep-libs"] },
     { github = "technetos", roles = ["council-rep-mods"] },
 ]
-alumni = ["khionu", "rylev"]
+alumni = ["khionu", "rylev", "carols10cents"]
 
 [[github]]
 orgs = ["rust-lang", "rust-lang-nursery"]
@@ -34,10 +33,6 @@ repo = "https://github.com/rust-lang/leadership-council"
 id = "council-rep-compiler"
 description = "Compiler team"
 
-[[roles]]
-id = "council-rep-crates-io"
-description = "Crates.io team"
-
 [[roles]]
 id = "council-rep-devtools"
 description = "Dev tools team"