Skip to content

Commit cb4d505

Browse files
committed
Address review comments
1 parent 635adc9 commit cb4d505

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

book/src/development/infrastructure/backport.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ some explanation and are quite subjective. Good judgement is required.
2323
done anyway, FP fixes might also be included. If the PR has a lot of changes,
2424
backports must be considered more carefully.
2525

26-
2. **Is the issue that was fixed by the PR in `beta` already?**
26+
2. **Is the problem that was fixed by the PR already in `beta`?**
2727

28-
Maybe the issue being fixed didn't make it to `beta` in the Rust repo, yet.
29-
If that's the case, and the fix is already synced to the Rust repo, the fix
30-
doesn't need to be backported. If the fix PR is not synced yet, the fix PR
31-
either needs to be "backported" to the Rust `master` branch or to `beta` in
32-
the next backport cycle.
28+
It could be that the problem that was fixed by the PR hasn't made it to the
29+
`beta` branch of the Rust repo yet. If that's the case, and the fix is
30+
already synced to the Rust repo, the fix doesn't need to be backported. If
31+
the fix PR is not synced yet, the fix PR either needs to be "backported" to
32+
the Rust `master` branch or to `beta` in the next backport cycle.
3333

3434
3. **Is the fix already synced to `master`?**
3535

book/src/development/infrastructure/sync.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This process is described in detail in the following sections.
2525
The sync is done with [JOSH] and fully scripted with `cargo dev sync`. The only
2626
requirement is to install the `josh-proxy` binary from GitHub
2727

28-
<!-- FIXME: Change to a release version once the fix is merged -->
28+
<!-- FIXME: Change to a release version once >r23.12.04 is released -->
2929

3030
```sh
3131
$ RUSTFLAGS="--cap-lints warn" cargo +stable install josh-proxy --git https://github.com/josh-project/josh
@@ -50,9 +50,11 @@ If there should be merge conflicts, resolve them now and commit with the message
5050
> Note: If the version tests fail, refer to [bump version] in the release
5151
> documentation.
5252
53-
Open a PR to `rust-lang/rust-clippy` and wait for it to get merged (to
54-
accelerate the process ping the `@rust-lang/clippy` team in your PR and/or ask
55-
them in the [Zulip] stream.)
53+
Open a PR to `rust-lang/rust-clippy` and if you are a Clippy maintainer, you can
54+
`r+` the PR yourself. If not, change `r? @ghost` to `r? clippy` and a Clippy
55+
maintainer will get assigned. To accelerate the process ping the Clippy team in
56+
[Zulip].
57+
5658

5759
[bump version]: release.md#bump-version
5860
[Zulip]: https://rust-lang.zulipchat.com/#narrow/stream/clippy
@@ -84,9 +86,6 @@ Sync from Clippy commit: rust-lang/rust-clippy@<sha1>
8486

8587
The title must be kept as is, to [tell triagebot] that this is a sync PR.
8688

87-
If you're a Clippy maintainer, you can `r+` the PR yourself. If not, change `r?
88-
@ghost` to `r? clippy`.
89-
9089
The second line must be kept as is, to [find the Clippy commit] during a
9190
release.
9291

0 commit comments

Comments
 (0)