Skip to content

Commit c1698fe

Browse files
flip1995phansch
andauthored
Apply suggestions from code review
Co-authored-by: Phil Hansch <dev@phansch.net>
1 parent 17d877c commit c1698fe

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ That's why the `else_if_without_else` example uses the `register_early_pass` fun
155155

156156
## Fixing build failures caused by Rust
157157

158-
Clippy currently gets build with `rustc` of the `rust-lang/rust` `master`
158+
Clippy currently gets built with `rustc` of the `rust-lang/rust` `master`
159159
branch. Most of the times we have to adapt to the changes and only very rarely
160160
there's an actual bug in Rust.
161161

@@ -170,15 +170,15 @@ Here is a TL;DR version of the sync process:
170170

171171
1. Clone the [`rust-lang/rust`] repository (all of the following commands have
172172
to be run inside the `rust` directory)
173-
2. Sync the changes to the copy of Clippy to your fork of the Clippy repository:
173+
2. Sync the changes to the rust-copy of Clippy to your Clippy fork:
174174
```bash
175175
# Make sure to change `your-github-name` to your github name in the following command
176176
git subtree push -P src/tools/clippy git@github.com:your-github-name/rust-clippy sync-from-rust
177177
```
178178
3. Open a PR to `rust-lang/rust-clippy` and wait for it to get merged (to
179179
accelerate the process ping the `@rust-lang/clippy` team in your PR and/or
180180
~~annoy~~ ask them in the [Discord] channel.)
181-
4. Sync the `rust-lang/rust-clippy` master to the copy of Clippy:
181+
4. Sync the `rust-lang/rust-clippy` master to the rust-copy of Clippy:
182182
```bash
183183
git checkout -b sync-from-clippy
184184
git subtree pull -P src/tools/clippy https://github.com/rust-lang/rust-clippy master

0 commit comments

Comments
 (0)