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