Auto merge of rust-lang#48202 - nrc:update, r=kennytm

Update RLS Should fix the RLS test breakage. r? @alexcrichton
kennytm · Feb 15, 2018 · 90759be · 90759be
2 parents 3ec5a99 + 45944f6
commit 90759be
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/tools/rls b/src/tools/rls
diff --git 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) {