about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-02-15 04:37:19 +0000
committerbors <bors@rust-lang.org>2018-02-15 04:37:19 +0000
commit90759befe0234b20ecf81edbbff353b85419d7e9 (patch)
treeb3f3276cb89cb962736343ff0ae0580ff41f1991 /src/tools
parent3ec5a99aaa0084d97a9e845b34fdf03d1462c475 (diff)
parent45944f670bec8128ef0b51a2391cd6c3c0f42941 (diff)
Auto merge of #48202 - nrc:update, r=kennytm
Update RLS

Should fix the RLS test breakage.

r? @alexcrichton
Diffstat (limited to 'src/tools')
m---------src/tools/rls0
-rw-r--r--src/tools/tidy/src/deps.rs1
2 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/rls b/src/tools/rls
-Subproject dee42bda8156a28ead609080e27b02173bb9c29
+Subproject f01491115e821e10217574ad4091b08015b7b1c
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 159c9e035b7..4dedf6bfe77 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -41,6 +41,7 @@ static EXCEPTIONS: &'static [&'static str] = &[
     "fuchsia-zircon", // BSD-3-Clause, rustdoc, rustc, cargo (jobserver & tempdir)
     "cssparser-macros", // MPL-2.0, rustdoc
     "selectors", // MPL-2.0, rustdoc
+    "clippy_lints", // MPL-2.0 rls
 ];
 
 pub fn check(path: &Path, bad: &mut bool) {