Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ PR's against [rust-lang-nursery/rust-forge].
when they malfunction and go on a bot rampage).

* [Cross compilation resources](cross-compilation/index.html)

* [RFC merge procedure](rfc-merge-procedure.html)
70 changes: 70 additions & 0 deletions rfc-merge-procedure.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
---
layout: default
title: RFC Merge Procedure
---

Once an RFC has been accepted (i.e., the final comment period is
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably good to clarify that this is after an FCP where no serious new issues/arguments were raised.

complete), it must be merged. Right now this is a manual process,
though just about anyone can do it (if you're not a subteam member,
though, you'll have to open a PR rather than merge the RFC
manually). Here is the complete set of steps to merge an RFC -- in
some cases, not all the steps will be applicable.

### Step 1: Open tracking issue

Open a tracking issue over on rust-lang/rust. Here is a
template for the issue text. You'll have to adjust the various places
labeled XXX with some suitable content (e.g., the name of the RFC, or
the most appropriate team).

```
This is a tracking issue for the RFC "XXX" (rust-lang/rfcs#NNN).

**Steps:**

- [ ] Implement the RFC (cc @rust-lang/XXX -- can anyone write up mentoring instructions?)
- [ ] Adjust documentation ([see instructions on forge][doc-guide])
- [ ] Stabilization PR ([see instructions on forge][stabilization-guide])

[stabilization-guide]: https://forge.rust-lang.org/stabilization-guide.html
[doc-guide]: https://forge.rust-lang.org/stabilization-guide.html#updating-documentation

**Unresolved questions:**

XXX --- list all the "unresolved questions" found in the RFC
to ensure they are not forgotten
```

Add the following labels to the issue:

- `B-rfc-approved`
- `B-unstable`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think B-unstable is only supposed to be applied when the impl has landed.

- the approriate `T-XXX` label

(If you don't have permissions to do so, leave a note cc'ing the
appropriate team and asking them to do so.)

### Step 2: Merge the RFC PR itself

In your local git checkout:

- Merge the RFC PR into master in your fork
- Add a commit that moves the file name from 0000- to its RFC number
- Edit the new file to include links to the RFC PR and the tracking issue you just created
in the header
- Open a PR or push directly to the master branch on rust-lang/rfcs, as appropriate

### Step 3: Leave a comment

Leave a final comment on the PR directing everyone to the tracking
issue. Something like this, but feel free to add your own personal
flavor (and change the team):

```
**Huzzah!** The @rust-lang/lang team has decided **to accept** this RFC.

To track further discussion, subscribe to the tracking issue here: rust-lang/rust#41517
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses a specific number instead of a placeholder.

```

### That's it, you're done!