summaryrefslogtreecommitdiffstats
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-09-18 13:13:57 +0200
committerOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-09-19 09:20:35 +0200
commitd64a0674231c12587ce6dc4295d5b78dec98c5a3 (patch)
tree862bb408c6b004d5570e4f9c29a0865e74cbf597 /CONTRIBUTING.md
parentAuto merge of #44680 - infinity0:master, r=Mark-Simulacrum (diff)
downloadgrust-d64a0674231c12587ce6dc4295d5b78dec98c5a3.tar.gz
grust-d64a0674231c12587ce6dc4295d5b78dec98c5a3.tar.bz2
grust-d64a0674231c12587ce6dc4295d5b78dec98c5a3.tar.xz
Add clippy to `toolstate.toml`
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md16
1 files changed, 2 insertions, 14 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 741ced8f09..72144f22f5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -330,23 +330,11 @@ it can be found
330Currently building Rust will also build the following external projects: 330Currently building Rust will also build the following external projects:
331 331
332* [clippy](https://github.com/rust-lang-nursery/rust-clippy) 332* [clippy](https://github.com/rust-lang-nursery/rust-clippy)
333* [miri](https://github.com/solson/miri)
333 334
334If your changes break one of these projects, you need to fix them by opening 335If your changes break one of these projects, you need to fix them by opening
335a pull request against the broken project. When you have opened a pull request, 336a pull request against the broken project. When you have opened a pull request,
336you can point the submodule at your pull request by calling 337you can disable the tool via `src/tools/toolstate.toml`.
337
338```
339git fetch origin pull/$id_of_your_pr/head:my_pr
340git checkout my_pr
341```
342
343within the submodule's directory. Don't forget to also add your changes with
344
345```
346git add path/to/submodule
347```
348
349outside the submodule.
350 338
351It can also be more convenient during development to set `submodules = false` 339It can also be more convenient during development to set `submodules = false`
352in the `config.toml` to prevent `x.py` from resetting to the original branch. 340in the `config.toml` to prevent `x.py` from resetting to the original branch.