From 1b155623d8e49d4a8b44889be5956b1d2c2b0147 Mon Sep 17 00:00:00 2001 From: flip1995 Date: Sun, 3 May 2020 15:58:30 +0200 Subject: [PATCH] List Clippy as a subtree, instead of a submodule --- CONTRIBUTING.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 051f5af7bc1..daeed0c1e3d 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/)