Skip to content

Commit a49d2b7

Browse files
authored
Rollup merge of rust-lang#71830 - oli-obk:subrepo_funness, r=Mark-Simulacrum
Remove clippy from some leftover lists of "possibly failing" tools rust-lang#70655 successfully made clippy get built and tested on CI on every merge, but the lack of emitted toolstate info caused the toolstate to get updated to test-fail. We should remove clippy entirely from toolstate, as it now is always test-pass. The changes made in this PR reflect what we do for `rustdoc`, which is our preexisting tool that is gated on CI. r? @Mark-Simulacrum
2 parents 12fc1e0 + 675b585 commit a49d2b7

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

src/bootstrap/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ impl Step for Clippy {
528528
host,
529529
"test",
530530
"src/tools/clippy",
531-
SourceType::Submodule,
531+
SourceType::InTree,
532532
&[],
533533
);
534534

src/bootstrap/toolstate.rs

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ static STABLE_TOOLS: &[(&str, &str)] = &[
7878
("edition-guide", "src/doc/edition-guide"),
7979
("rls", "src/tools/rls"),
8080
("rustfmt", "src/tools/rustfmt"),
81-
("clippy-driver", "src/tools/clippy"),
8281
];
8382

8483
// These tools are permitted to not build on the beta/stable channels.

src/tools/publish_toolstate.py

-5
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
# read privileges on it). CI will fail otherwise.
2626
MAINTAINERS = {
2727
'miri': {'oli-obk', 'RalfJung', 'eddyb'},
28-
'clippy-driver': {
29-
'Manishearth', 'llogiq', 'mcarton', 'oli-obk', 'phansch', 'flip1995',
30-
'yaahc',
31-
},
3228
'rls': {'Xanewok'},
3329
'rustfmt': {'topecongiro'},
3430
'book': {'carols10cents', 'steveklabnik'},
@@ -45,7 +41,6 @@
4541

4642
REPOS = {
4743
'miri': 'https://github.com/rust-lang/miri',
48-
'clippy-driver': 'https://github.com/rust-lang/rust-clippy',
4944
'rls': 'https://github.com/rust-lang/rls',
5045
'rustfmt': 'https://github.com/rust-lang/rustfmt',
5146
'book': 'https://github.com/rust-lang/book',

0 commit comments

Comments
 (0)