Merge pull request #1019 from Veykril/rust-analyzer

Merge rust-analyzer-contributors into rust-analyzer
rust-lang · Jun 23, 2023 · eb0716a · eb0716a
2 parents 389b0e4 + 8f16f92
commit eb0716a
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 23 deletions.
diff --git a/people/HKalbasi.toml b/people/HKalbasi.toml
@@ -2,3 +2,4 @@ name = 'Hamidreza Kalbasi'
 github = 'HKalbasi'
 github-id = 45197576
 email = 'hamidrezakalbasi@protonmail.com'
+zulip-id = 401078
diff --git a/people/Veykril.toml b/people/Veykril.toml
@@ -2,3 +2,4 @@ name = "Lukas Wirth"
 github = "Veykril"
 github-id = 3757771
 email = "lukastw97@gmail.com"
+zulip-id = 300586
diff --git a/people/flodiebold.toml b/people/flodiebold.toml
@@ -2,5 +2,4 @@ name = "Florian Diebold"
 github = "flodiebold"
 github-id = 906069
 email = "flodiebold@gmail.com"
-
-
+zulip-id = 129457
diff --git a/people/lnicola.toml b/people/lnicola.toml
@@ -2,3 +2,4 @@ name = "Laurențiu Nicola"
 github = "lnicola"
 github-id = 308347
 email = 'lnicola@dend.ro'
+zulip-id = 203546
diff --git a/people/matklad.toml b/people/matklad.toml
@@ -2,6 +2,7 @@ name = "Aleksey Kladov"
 github = "matklad"
 github-id = 1711539
 email = "aleksey.kladov@gmail.com"
+zulip-id = 133169
 
 [permissions]
 bors.vscode-rust.review = true
diff --git a/repos/rust-lang/rust-analyzer.toml b/repos/rust-lang/rust-analyzer.toml
@@ -5,7 +5,6 @@ bots = ["bors", "rustbot"]
 
 [access.teams]
 rust-analyzer = "write"
-rust-analyzer-contributors = "triage"
 
 [[branch-protections]]
 pattern = "master"
diff --git a/teams/rust-analyzer-contributors.toml b/teams/rust-analyzer-contributors.toml
diff --git a/teams/rust-analyzer.toml b/teams/rust-analyzer.toml
@@ -3,8 +3,20 @@ subteam-of = "compiler"
 
 [people]
 leads = ["Veykril"]
-members = ["matklad", "lnicola", "Veykril", "flodiebold"]
-alumni = ["jonas-schievink"]
+members = [
+    "matklad",
+    "lnicola",
+    "Veykril",
+    "flodiebold",
+    "bjorn3",
+    "lowr",
+    "HKalbasi",
+]
+alumni = [
+    "jonas-schievink",
+    "edwin0cheng",
+    "SomeoneToIgnore",
+]
 
 [website]
 name = "rust-analyzer team"
@@ -17,3 +29,6 @@ bors.rust-analyzer.review = true
 
 [[github]]
 orgs = ["rust-lang", "rust-analyzer"]
+
+[[zulip-groups]]
+name = "T-rust-analyzer"