Skip to content
This repository was archived by the owner on Mar 14, 2023. It is now read-only.

Commit e6b00ea

Browse files
Mark-SimulacrumMark-Simulacrum
authored
Merge pull request #356 from jackh726/teams
Add groups from expert map
2 parents c94637e + 9e4fb8d commit e6b00ea

File tree

3 files changed

+110
-33
lines changed

3 files changed

+110
-33
lines changed

‎highfive/configs/rust-lang/rust.json

Lines changed: 90 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
"@jackh726",
1616
"@cjgillot"
1717
],
18+
"compiler": [
19+
"compiler-team",
20+
"compiler-team-contributors"
21+
],
1822
"libs": [
1923
"@dtolnay",
2024
"@joshtriplett",
@@ -32,42 +36,95 @@
3236
"@GuillaumeGomez",
3337
"@ollie27",
3438
"@CraftSpider"
39+
],
40+
"query-system": [
41+
"@cjgillot"
42+
],
43+
"incremental": [
44+
"@michaelwoerister",
45+
"@wesleywiser"
46+
],
47+
"typeck": [],
48+
"diagnostics": [
49+
"@davidtwco",
50+
"@estebank",
51+
"@oli-obk"
52+
],
53+
"parser": [
54+
"@davidtwco",
55+
"@estebank",
56+
"@petrochenkov"
57+
],
58+
"lexer": [
59+
"@petrochenkov"
60+
],
61+
"mir": [
62+
"@davidtwco",
63+
"@oli-obk"
64+
],
65+
"mir-opt": [
66+
"@nagisa",
67+
"@oli-obk",
68+
"@wesleywiser"
69+
],
70+
"traits": [
71+
"@jackh726",
72+
"@matthewjasper"
73+
],
74+
"borrowck": [
75+
"@davidtwco",
76+
"@matthewjasper",
77+
"@pnkfelix"
3578
]
3679
},
3780
"dirs": {
38-
".github/workflows": ["infra-ci"],
39-
"Cargo.lock": ["@Mark-Simulacrum"],
40-
"Cargo.toml": ["@Mark-Simulacrum"],
41-
"compiler": ["compiler-team", "compiler-team-contributors"],
42-
"compiler/rustc_apfloat": ["@eddyb"],
43-
"compiler/rustc_llvm": ["@cuviper"],
44-
"library/alloc": ["libs"],
45-
"library/core": ["libs", "@scottmcm"],
46-
"library/panic_abort": ["libs"],
47-
"library/panic_unwind": ["libs"],
48-
"library/proc_macro": ["@petrochenkov"],
49-
"library/std": ["libs"],
50-
"library/stdarch": ["libs"],
51-
"library/term": ["libs"],
52-
"library/test": ["libs"],
53-
"src/bootstrap": ["@Mark-Simulacrum"],
54-
"src/build_helper": ["@Mark-Simulacrum"],
55-
"src/ci": ["infra-ci"],
56-
"src/doc": ["doc"],
57-
"src/etc": ["@Mark-Simulacrum"],
58-
"src/librustdoc": ["rustdoc"],
59-
"src/llvm-project": ["@cuviper"],
60-
"src/stage0.txt": ["@Mark-Simulacrum"],
61-
"src/tools/cargo": ["@ehuss", "@joshtriplett"],
62-
"src/tools/compiletest": ["@Mark-Simulacrum", "@Centril"],
63-
"src/tools/linkchecker": ["@ehuss"],
64-
"src/tools/rust-installer": ["@Mark-Simulacrum"],
65-
"src/tools/rustbook": ["doc", "@ehuss"],
66-
"src/tools/rustdoc": ["rustdoc"],
67-
"src/tools/rustdoc-js": ["rustdoc"],
68-
"src/tools/rustdoc-js-std": ["rustdoc"],
69-
"src/tools/rustdoc-themes": ["rustdoc"],
70-
"src/tools/tidy": ["@Mark-Simulacrum"]
81+
".github/workflows": ["infra-ci"],
82+
"Cargo.lock": ["@Mark-Simulacrum"],
83+
"Cargo.toml": ["@Mark-Simulacrum"],
84+
"compiler": ["compiler"],
85+
"compiler/rustc_apfloat": ["@eddyb"],
86+
"compiler/rustc_ast/": ["compiler", "parser"],
87+
"compiler/rustc_lexer": ["compiler", "lexer"],
88+
"compiler/rustc_llvm": ["@cuviper"],
89+
"compiler/rustc_middle/src/mir": ["compiler", "mir"],
90+
"compiler/rustc_middle/src/traits": ["compiler", "traits"],
91+
"compiler/rustc_mir/src/interpret": ["compiler", "mir"],
92+
"compiler/rustc_mir/src/transform": ["compiler", "mir-opt"],
93+
"compiler/rustc_mir_build/src/build": ["compiler", "mir"],
94+
"compiler/rustc_typeck": ["compiler", "typeck"],
95+
"compiler/rustc_traits": ["compiler", "traits"],
96+
"compiler/rustc_trait_selection": ["compiler", "traits"],
97+
"compiler/rustc_parse": ["compiler", "parser"],
98+
"compiler/rustc_parse/src/parse/lexer/": ["compiler", "lexer"],
99+
"compiler/rustc_query_impl": ["compiler", "query-system"],
100+
"compiler/rustc_query_system": ["compiler", "query-system"],
101+
"library/alloc": ["libs"],
102+
"library/core": ["libs", "@scottmcm"],
103+
"library/panic_abort": ["libs"],
104+
"library/panic_unwind": ["libs"],
105+
"library/proc_macro": ["@petrochenkov"],
106+
"library/std": ["libs"],
107+
"library/stdarch": ["libs"],
108+
"library/term": ["libs"],
109+
"library/test": ["libs"],
110+
"src/bootstrap": ["@Mark-Simulacrum"],
111+
"src/build_helper": ["@Mark-Simulacrum"],
112+
"src/ci": ["infra-ci"],
113+
"src/doc": ["doc"],
114+
"src/etc": ["@Mark-Simulacrum"],
115+
"src/librustdoc": ["rustdoc"],
116+
"src/llvm-project": ["@cuviper"],
117+
"src/stage0.txt": ["@Mark-Simulacrum"],
118+
"src/tools/cargo": ["@ehuss", "@joshtriplett"],
119+
"src/tools/compiletest": ["@Mark-Simulacrum"],
120+
"src/tools/linkchecker": ["@ehuss"],
121+
"src/tools/rust-installer": ["@Mark-Simulacrum"],
122+
"src/tools/rustbook": ["doc", "@ehuss"],
123+
"src/tools/rustdoc": ["rustdoc"],
124+
"src/tools/rustdoc-js": ["rustdoc"],
125+
"src/tools/rustdoc-js-std": ["rustdoc"],
126+
"src/tools/rustdoc-themes": ["rustdoc"],
127+
"src/tools/tidy": ["@Mark-Simulacrum"]
71128
},
72129
"mentions": {
73130
"src/rustdoc-json-types": {

‎highfive/tests/fakes.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ def get_repo_configs():
4444
"some": ["all"],
4545
},
4646
},
47+
'nested_groups': {
48+
"groups": {
49+
"all": [],
50+
"a": ["@pnkfelix"],
51+
"b": ["@nrc"],
52+
"c": ["a", "b"]
53+
},
54+
"dirs": {"src/librustc_typeck": ["c"]},
55+
},
4756
'empty': {
4857
"groups": {"all": []},
4958
"dirs": {},

‎highfive/tests/test_newpr.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,6 +1160,17 @@ def test_circular_groups(self):
11601160
'rust', 'rust-lang', self.fakes['diff']['normal'], 'fooauthor'
11611161
)
11621162

1163+
def test_nested_groups(self):
1164+
"""Test choosing a reviewer from group with nested groups.
1165+
"""
1166+
self.handler = HighfiveHandlerMock(
1167+
Payload({}), repo_config=self.fakes['config']['nested_groups']
1168+
).handler
1169+
(chosen_reviewers, mentions) = self.choose_reviewers(
1170+
self.fakes['diff']['normal'], "nikomatsakis"
1171+
)
1172+
assert set(["pnkfelix", "nrc"]) == chosen_reviewers
1173+
11631174
def test_global_core(self):
11641175
"""Test choosing a reviewer from the core group in the global
11651176
configuration.

0 commit comments

Comments
 (0)