about summary refs log tree commit diff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorEduardo Broto <ebroto@tutanota.com>2020-11-29 18:08:47 +0100
committerflip1995 <philipp.krones@embecosm.com>2020-12-10 09:57:29 +0100
commit613333acd537dff5844cd1ed72d4e6f56752ee6a (patch)
tree343699e76348812ac9c81cd6bdcfc0057e393e84 /CONTRIBUTING.md
parent6c70133faa059a9e71dc386d70121a23a65715ab (diff)
downloadrust-613333acd537dff5844cd1ed72d4e6f56752ee6a.tar.gz
rust-613333acd537dff5844cd1ed72d4e6f56752ee6a.zip
Pin Clippy to a nightly
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md21
1 files changed, 12 insertions, 9 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f8c26e2d456..29cbe2a08ec 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -182,18 +182,21 @@ That's why the `else_if_without_else` example uses the `register_early_pass` fun
 [early_lint_pass]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/trait.EarlyLintPass.html
 [late_lint_pass]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/trait.LateLintPass.html
 
-## Fixing build failures caused by Rust
+## Syncing changes from [`rust-lang/rust`] to Clippy
 
-Clippy currently gets built with `rustc` of the `rust-lang/rust` `master`
-branch. Most of the times we have to adapt to the changes and only very rarely
-there's an actual bug in Rust.
+Clippy currently gets built with a pinned nightly version.
 
-If you decide to make Clippy work again with a Rust commit that breaks it, you
-have to sync the `rust-lang/rust-clippy` repository with the `subtree` copy of
-Clippy in the `rust-lang/rust` repository.
+In the `rust-lang/rust` repository, where rustc resides, there's a copy of Clippy
+that compiler hackers modify from time to time to adapt to changes in the unstable
+API of the compiler.
 
-For general information about `subtree`s in the Rust repository see [Rust's
-`CONTRIBUTING.md`][subtree].
+We need to sync these changes back to this repository periodically. If you want
+to help with that, you have to sync the `rust-lang/rust-clippy` repository with 
+the `subtree` copy of Clippy in the `rust-lang/rust` repository, and update
+the `rustc-toolchain` file accordingly.
+
+For general information about `subtree`s in the Rust repository
+see [Rust's `CONTRIBUTING.md`][subtree].
 
 ### Patching git-subtree to work with big repos