Skip to content

Commit 53d3bc0

Browse files
committedMay 2, 2020
Auto merge of #70655 - oli-obk:subrepo_funness, r=Mark-Simulacrum
Make clippy a git subtree instead of a git submodule r? @eddyb cc #70651 documentation at #70654
2 parents 7184d13 + bce9fae commit 53d3bc0

File tree

1,294 files changed

+114583
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,294 files changed

+114583
-133
lines changed
 

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
[submodule "src/tools/rls"]
1717
path = src/tools/rls
1818
url = https://github.com/rust-lang/rls.git
19-
[submodule "src/tools/clippy"]
20-
path = src/tools/clippy
21-
url = https://github.com/rust-lang/rust-clippy.git
2219
[submodule "src/tools/rustfmt"]
2320
path = src/tools/rustfmt
2421
url = https://github.com/rust-lang/rustfmt.git

‎src/bootstrap/builder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ impl<'a> Builder<'a> {
351351
native::Lld
352352
),
353353
Kind::Check | Kind::Clippy | Kind::Fix | Kind::Format => {
354-
describe!(check::Std, check::Rustc, check::Rustdoc)
354+
describe!(check::Std, check::Rustc, check::Rustdoc, check::Clippy)
355355
}
356356
Kind::Test => describe!(
357357
crate::toolstate::ToolStateCheck,

0 commit comments

Comments
 (0)
Please sign in to comment.