Merge branch 'master' into rustup/djc

rust-lang · Oct 2, 2023 · 09b5643 · 09b5643
2 parents 5d32b2a + 29d82aa
commit 09b5643
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/people/rami3l.toml b/people/rami3l.toml
@@ -0,0 +1,5 @@
+name = 'rami3l'
+github = 'rami3l'
+github-id = 33851577
+email = '[email protected]'
+zulip-id = 616990
diff --git a/repos/rust-lang/impl-trait-utils.toml b/repos/rust-lang/impl-trait-utils.toml
@@ -0,0 +1,13 @@
+org = "rust-lang"
+name = "impl-trait-utils"
+description = "Utilities for working with impl traits in Rust."
+bots = []
+
+[access.teams]
+wg-async = "write"
+
+[access.individuals]
+tmandry = "maintain"
+
+[[branch-protections]]
+pattern = "main"
diff --git a/repos/rust-lang/wg-macros.toml b/repos/rust-lang/wg-macros.toml
@@ -0,0 +1,10 @@
+org = "rust-lang"
+name = "wg-macros"
+description = "Home of the Rust Macros Working Gruop"
+bots = ["rustbot"]
+
+[access.teams]
+wg-macros = "maintain"
+
+[[branch-protections]]
+pattern = "main"
diff --git a/teams/rustdoc-contributors.toml b/teams/rustdoc-contributors.toml
@@ -19,4 +19,4 @@ extra-teams = ["rustdoc"]
 [website]
 name = "Rustdoc team contributors"
 description = "Contributing to Rustdoc on a regular basis"
-zulip-stream = "rustdoc"
+zulip-stream = "t-rustdoc"
diff --git a/teams/rustdoc.toml b/teams/rustdoc.toml
@@ -36,7 +36,7 @@ ping = "rust-lang/rustdoc"
 [website]
 name = "Rustdoc team"
 description = "Developing and managing the Rustdoc documentation tool"
-zulip-stream = "rustdoc"
+zulip-stream = "t-rustdoc"
 repo = "https://github.com/rust-lang/rust"
 
 [[lists]]

diff --git a/teams/rustup.toml b/teams/rustup.toml
@@ -8,6 +8,7 @@ leads = [
 members = [
     "rbtcollins",
     "djc",
+    "rami3l",
 ]
 alumni = [
     "nrc",