From 2c58936a27366bca0e4fd71f1ad51b514b633c92 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Wed, 28 Aug 2019 21:46:04 +0900 Subject: [PATCH] Add note to fix toolstate --- CONTRIBUTING.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a85197068f5..bf681a49b98d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -145,13 +145,28 @@ using that version of Rust. You can use [rustup-toolchain-install-master][rtim] to do that: -``` +```bash cargo install rustup-toolchain-install-master rustup-toolchain-install-master -n master --force rustup override set master cargo test ``` +After fixing the build failure on this repository, we can submit a pull request +to [`rust-lang/rust`] to fix the toolstate. + +To submit a pull request, you should follow these steps: + +```bash +# Assuming you already cloned the rust-lang/rust repo and you're in the correct directory +git submodule update --remote src/tools/clippy +cargo update -p clippy +git add -u +git commit -m "Update Clippy" +./x.py test -i --stage 1 src/tools/clippy # This is optional and should succeed anyway +# Open a PR in rust-lang/rust +``` + ## Issue and PR triage Clippy is following the [Rust triage procedure][triage] for issues and pull @@ -211,3 +226,4 @@ or the [MIT](http://opensource.org/licenses/MIT) license. [homu]: https://github.com/servo/homu [homu_instructions]: https://buildbot2.rust-lang.org/homu/ [homu_queue]: https://buildbot2.rust-lang.org/homu/queue/clippy +[`rust-lang/rust`]: https://github.com/rust-lang/rust