Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
flip1995 committed Jul 23, 2024
1 parent 635adc9 commit cb4d505
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
12 changes: 6 additions & 6 deletions book/src/development/infrastructure/backport.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ some explanation and are quite subjective. Good judgement is required.
done anyway, FP fixes might also be included. If the PR has a lot of changes,
backports must be considered more carefully.

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

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

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

Expand Down
13 changes: 6 additions & 7 deletions book/src/development/infrastructure/sync.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This process is described in detail in the following sections.
The sync is done with [JOSH] and fully scripted with `cargo dev sync`. The only
requirement is to install the `josh-proxy` binary from GitHub

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

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


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

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

If you're a Clippy maintainer, you can `r+` the PR yourself. If not, change `r?
@ghost` to `r? clippy`.

The second line must be kept as is, to [find the Clippy commit] during a
release.

Expand Down

0 comments on commit cb4d505

Please sign in to comment.