@@ -4,42 +4,59 @@ for permission to proceed with an experiment or refactoring, or when stabilizing
44document aims to summarise the various processes that the rustdoc team has for making approval
55decisions and when each should be used.
66
7- ## Approvals
8- There are two mechanisms that the team can use to approve a proposal (not all approval mechanisms
9- are suitable for each method of making a proposal - see below):
107
11- - r+
12- - A proposal (an RFC or an FCP) is r+'d when it is approved to be merged.
13- - r+ can only be used to approve a PR.
14- - FCP
15- - A final comment period will require sign-off from a majority (all members minus 2)
16- of the rustdoc team to approve a proposal and then a ten day waiting period.
17- - FCPs can be used to approve any form of proposal.
8+ [ *r+* ] : ../compiler/reviews.html#bors
189
1910## Proposals
20- There are three ways to propose a change to the rustdoc team. The appropriate choice depends on
11+ There are four ways to propose a change to the rustdoc team. The appropriate choice depends on
2112the nature of the proposal, described below.
2213
23- - Open a discussion on the [ rustdoc zulip thread] .
24- - This is the preferred way. It allows to prevent users to lose too much time implementing
14+ - Open a discussion in the [ rustdoc Zulip channel] .
15+ - This is the preferred way <!-- FIXME(fmease): not always tho? Just open a PR dude --> .
16+ It allows to prevent users to lose too much time implementing
2517 something if in the end, the team will ask major changes or even refuse it. After the
2618 discussion, if accepted and depending on the change, an RFC or a PR will be the next step.
19+ - <!-- FIXME(fmease): Clarify what "approval" means. Namely the approvals are casual,
20+ "non-binding". >=1 endorsements is fine/usual -->
2721- Request For Comments (RFC)
28- - RFCs are pull requests to the [ ` rust-lang/rfcs ` ] [ rfcs ] repository and are a heavy-weight
22+ - RFCs are pull requests to the [ ` rust-lang/rfcs ` ] repository and are a heavy-weight
2923 proposal mechanism, reserved for significant changes.
3024 - RFC proposals can only be approved by * FCPs* .
25+ - <!-- FIXME(fmease): Or mention the "r+ after FCP" topic from above here instead -->
3126- Pull Request (PR)
32- - Opening a pull request on the [ ` rust-lang/rust ` ] [ rust ] repository is a lightweight
27+ - Opening a pull request on the [ ` rust-lang/rust ` ] repository is a lightweight
3328 mechanism suitable for most proposals. This is preferred in cases such as stabilization
3429 of a rustdoc flag or addition of a new target.
3530 - PR proposals can be approved by * FCPs* or * r+* . See * When are FCPs/RFCs required?*
3631 section below when * r+* isn't sufficient alone.
3732- Issues
38- - Opening an issue on the [ ` rust-lang/rust ` ] [ rust ] repository are also a good starting
33+ - Opening an issue in the [ ` rust-lang/rust ` ] repository is also a good starting
3934 point if you don't know which of the previous ways is the best fit.
35+ - <!-- FIXME(fmease): Clarify that there's no process for approvals for
36+ GH issues; moreover mention that we usually don't FCP issue proposals but
37+ instead the corresponding PR -->
38+
39+ [ rustdoc Zulip channel ] : https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc
40+ [ `rust-lang/rust` ] : https://github.com/rust-lang/rust
41+ [ `rust-lang/rfcs` ] : https://github.com/rust-lang/rfcs
4042
41- [ rustdoc zulip thread ] : https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc
42- [ rust ] : https://github.com/rust-lang/rust
43+ ## Approvals
44+ There are two mechanisms that the team can use to approve a [ proposal] ( #proposals ) . (not all approval mechanisms
45+ are suitable for each method of making a proposal -- [ see below] ( #proposals ) ):
46+
47+ - [ * r+* ] <!-- or GH approval or merge -->
48+ - A proposal is * r+* 'd when it is approved to be merged.
49+ - * r+* can only be used to approve a PR.
50+ - <!-- FIXME(fmease): *somewhere* I want to clarify *who* is in charge of the r+
51+ (namely any team member(s) but usually PR assignee(s)) -->
52+ - <!-- FIXME(fmease): r-l/r isn't the only repo (e.g., dev guide, forge, rustdoc-json-types, rfcs) -->
53+ - FCP
54+ - A final comment period will require sign-off from a majority (all members minus 2)
55+ of the rustdoc team to approve a proposal and then a ten day waiting period.
56+ - FCPs can be used to approve any form of proposal.
57+ - <!-- FIXME(fmease): Somewhere I want to clarify that after an FCP, in r-l/r
58+ a separate r+ is still necessary by someone / a GH approval in other repos;
59+ also I want to mention somewhere that any team is allowed to merge an FCP'ed RFC -->
4360
4461### When are FCPs/RFCs required?
4562
@@ -48,6 +65,9 @@ the GUI web interface, new command-line arguments, new attributes, etc. However,
4865is considered too big/important, an RFC will need to be written and approved before the change
4966will be accepted.
5067
68+ <!-- FIXME(fmease): ^^^ Tweak phrasing. The stabilization of an already-RFC'ed feature
69+ always(?) requires an FCP (and doesn't need another RFC :P) -->
70+
5171When starting an FCP, make sure only the relevant subteam is labeled on the issue/PR, to avoid
5272pinging people with changes they aren't interested in.
5373
@@ -56,11 +76,15 @@ If the approval required for the contribution requires an RFC, then the contribu
5676should be closed or marked as blocked, with a request to create an RFC first. If approval of
5777a PR is acceptable for the specific contribution (see below), then the approval process can begin.
5878
59- ### Can I work on code experimentally before a approval is gained?
79+ <!-- FIXME: Mention S-blocked -->
80+
81+ ### Can I work on code experimentally before an approval is gained?
6082Of course! You are free to work on PRs or write code. But those PRs should be marked as
6183experimental and they should not land, nor should anyone be expected to review them (unless
6284folks want to).
6385
86+ <!-- FIXME: Mention S-experimental -->
87+
6488## What makes a good proposal?
6589A good proposal will address the following:
6690
@@ -74,7 +98,6 @@ A good proposal will address the following:
7498* ** Alternatives, concerns, and key decisions:** Were there any alternatives considered? If so, why
7599 did you pick this design?
76100
77- [ rfcs ] : https://github.com/rust-lang/rfcs
78101[ Haddock ] : https://haskell-haddock.readthedocs.io/latest/
79102[ Wikipedia ] : https://www.wikipedia.org/
80103[ Racket ] : https://docs.racket-lang.org/
0 commit comments