1 files changed, 26 insertions, 11 deletions

diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index d65a2acbc..ebd42cef7 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -44,11 +44,26 @@ fn rust_files_are_tidy() {
         let text = fs2::read_to_string(&path).unwrap();
         check_todo(&path, &text);
         check_trailing_ws(&path, &text);
+        deny_clippy(&path, &text);
         tidy_docs.visit(&path, &text);
     }
     tidy_docs.finish();
 }
 
+fn deny_clippy(path: &PathBuf, text: &String) {
+    if text.contains("[\u{61}llow(clippy") {
+        panic!(
+            "\n\nallowing lints is forbidden: {}.
+rust-analyzer intentionally doesn't check clippy on CI.
+You can allow lint globally via `xtask clippy`.
+See https://github.com/rust-lang/rust-clippy/issues/5537 for discussion.
+
+",
+            path.display()
+        )
+    }
+}
+
 #[test]
 fn check_licenses() {
     let expected = "
@@ -67,7 +82,7 @@ MIT/Apache-2.0
 MIT/Apache-2.0 AND BSD-2-Clause
 Unlicense OR MIT
 Unlicense/MIT
-Zlib
+Zlib OR Apache-2.0 OR MIT
 "
     .lines()
     .filter(|it| !it.is_empty())
@@ -177,16 +192,16 @@ impl TidyDocs {
         }
 
         let poorly_documented = [
-            "ra_hir",
-            "ra_hir_expand",
-            "ra_ide",
-            "ra_mbe",
-            "ra_parser",
-            "ra_prof",
-            "ra_project_model",
-            "ra_syntax",
-            "ra_tt",
-            "ra_hir_ty",
+            "hir",
+            "hir_expand",
+            "ide",
+            "mbe",
+            "parser",
+            "profile",
+            "project_model",
+            "syntax",
+            "tt",
+            "hir_ty",
         ];
 
         let mut has_fixmes =