summary refs log tree commit diff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-05-04 03:15:01 +0200
committerGitHub <noreply@github.com>2020-05-04 03:15:01 +0200
commit34421fd1af9184fc6cf3194b0eddf5d813c5e816 (patch)
tree1174cab495a87604319a447512ed0f99c46a3949 /CONTRIBUTING.md
parent911bf894682b384f10a6d10c3d69491c0fdf83bc (diff)
parent1b155623d8e49d4a8b44889be5956b1d2c2b0147 (diff)
downloadrust-34421fd1af9184fc6cf3194b0eddf5d813c5e816.tar.gz
rust-34421fd1af9184fc6cf3194b0eddf5d813c5e816.zip
Rollup merge of #71844 - flip1995:subtree_clippy_doc, r=oli-obk
List Clippy as a subtree, instead of a submodule

r? @oli-obk
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e674cf61b51..11a7144a2ab 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -193,7 +193,7 @@ it can be found [here][rctd].
 As a developer to this repository, you don't have to treat the following external projects
 differently from other crates that are directly in this repo:
 
-* none so far, see https://github.com/rust-lang/rust/issues/70651 for more info
+* Clippy
 
 They are just regular files and directories. This is in contrast to `submodule` dependencies
 (see below for those). Only tool authors will actually use any operations here.
@@ -247,7 +247,7 @@ git subtree add -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git
 This will create a new commit, which you may not rebase under any circumstances! Delete the commit
 and redo the operation if you need to rebase.
 
-Now you're done, the `src/tools/clippy` directory behaves as if clippy were part of the rustc
+Now you're done, the `src/tools/clippy` directory behaves as if Clippy were part of the rustc
 monorepo, so no one but you (or others that synchronize subtrees) actually needs to use `git subtree`.
 
 
@@ -255,7 +255,6 @@ monorepo, so no one but you (or others that synchronize subtrees) actually needs
 
 Currently building Rust will also build the following external projects:
 
-* [clippy](https://github.com/rust-lang/rust-clippy)
 * [miri](https://github.com/rust-lang/miri)
 * [rustfmt](https://github.com/rust-lang/rustfmt)
 * [rls](https://github.com/rust-lang/rls/)