about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2020-05-03 11:40:45 +0200
committerOliver Scherer <github35764891676564198441@oli-obk.de>2020-05-03 11:40:45 +0200
commit675b585931d870ad4207d60ef43179390526a2fc (patch)
tree2827615d4c0dd88ee64ff6d06e608c2e849d9402
parent0a675c5e02e6ecfda7d4e04aabd23a9935e0c4bf (diff)
downloadrust-675b585931d870ad4207d60ef43179390526a2fc.tar.gz
rust-675b585931d870ad4207d60ef43179390526a2fc.zip
Remove clippy from some leftover lists of "possibly failing" tools
-rw-r--r--src/bootstrap/test.rs2
-rw-r--r--src/bootstrap/toolstate.rs1
-rwxr-xr-xsrc/tools/publish_toolstate.py5
3 files changed, 1 insertions, 7 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 90b8b5eea94..0cf47d20ead 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -528,7 +528,7 @@ impl Step for Clippy {
                 host,
                 "test",
                 "src/tools/clippy",
-                SourceType::Submodule,
+                SourceType::InTree,
                 &[],
             );
 
diff --git a/src/bootstrap/toolstate.rs b/src/bootstrap/toolstate.rs
index e6560771c0e..cd8ce4881b1 100644
--- a/src/bootstrap/toolstate.rs
+++ b/src/bootstrap/toolstate.rs
@@ -78,7 +78,6 @@ static STABLE_TOOLS: &[(&str, &str)] = &[
     ("edition-guide", "src/doc/edition-guide"),
     ("rls", "src/tools/rls"),
     ("rustfmt", "src/tools/rustfmt"),
-    ("clippy-driver", "src/tools/clippy"),
 ];
 
 // These tools are permitted to not build on the beta/stable channels.
diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py
index 2da62b6bd99..988a226706d 100755
--- a/src/tools/publish_toolstate.py
+++ b/src/tools/publish_toolstate.py
@@ -25,10 +25,6 @@ except ImportError:
 # read privileges on it). CI will fail otherwise.
 MAINTAINERS = {
     'miri': {'oli-obk', 'RalfJung', 'eddyb'},
-    'clippy-driver': {
-        'Manishearth', 'llogiq', 'mcarton', 'oli-obk', 'phansch', 'flip1995',
-        'yaahc',
-    },
     'rls': {'Xanewok'},
     'rustfmt': {'topecongiro'},
     'book': {'carols10cents', 'steveklabnik'},
@@ -45,7 +41,6 @@ MAINTAINERS = {
 
 REPOS = {
     'miri': 'https://github.com/rust-lang/miri',
-    'clippy-driver': 'https://github.com/rust-lang/rust-clippy',
     'rls': 'https://github.com/rust-lang/rls',
     'rustfmt': 'https://github.com/rust-lang/rustfmt',
     'book': 'https://github.com/rust-lang/book',