Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links

Hasn't fixed tests yet.

1 files changed, 48 insertions, 11 deletions

diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index d38ac7f17..d65a2acbc 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -5,7 +5,7 @@ use std::{
 
 use xtask::{
     codegen::{self, Mode},
-    not_bash::fs2,
+    not_bash::{fs2, run},
     project_root, run_rustfmt, rust_files,
 };
 
@@ -49,19 +49,56 @@ fn rust_files_are_tidy() {
     tidy_docs.finish();
 }
 
+#[test]
+fn check_licenses() {
+    let expected = "
+0BSD OR MIT OR Apache-2.0
+Apache-2.0 OR BSL-1.0
+Apache-2.0 OR MIT
+Apache-2.0/MIT
+BSD-2-Clause
+BSD-3-Clause
+CC0-1.0
+ISC
+MIT
+MIT / Apache-2.0
+MIT OR Apache-2.0
+MIT/Apache-2.0
+MIT/Apache-2.0 AND BSD-2-Clause
+Unlicense OR MIT
+Unlicense/MIT
+Zlib
+"
+    .lines()
+    .filter(|it| !it.is_empty())
+    .collect::<Vec<_>>();
+
+    let meta = run!("cargo metadata --format-version 1"; echo = false).unwrap();
+    let mut licenses = meta
+        .split(|c| c == ',' || c == '{' || c == '}')
+        .filter(|it| it.contains(r#""license""#))
+        .map(|it| it.trim())
+        .map(|it| it[r#""license":"#.len()..].trim_matches('"'))
+        .collect::<Vec<_>>();
+    licenses.sort();
+    licenses.dedup();
+    assert_eq!(licenses, expected);
+}
+
 fn check_todo(path: &Path, text: &str) {
-    let whitelist = &[
-        // This file itself is whitelisted since this test itself contains matches.
+    let need_todo = &[
+        // This file itself obviously needs to use todo (<- like this!).
         "tests/cli.rs",
-        // Some of our assists generate `todo!()` so those files are whitelisted.
+        // Some of our assists generate `todo!()`.
         "tests/generated.rs",
         "handlers/add_missing_impl_members.rs",
-        "handlers/add_function.rs",
         "handlers/add_turbo_fish.rs",
-        // To support generating `todo!()` in assists, we have `expr_todo()` in ast::make.
+        "handlers/generate_function.rs",
+        // To support generating `todo!()` in assists, we have `expr_todo()` in
+        // `ast::make`.
         "ast/make.rs",
     ];
-    if whitelist.iter().any(|p| path.ends_with(p)) {
+    if need_todo.iter().any(|p| path.ends_with(p)) {
         return;
     }
     if text.contains("TODO") || text.contains("TOOD") || text.contains("todo!") {
@@ -139,7 +176,7 @@ impl TidyDocs {
             )
         }
 
-        let whitelist = [
+        let poorly_documented = [
             "ra_hir",
             "ra_hir_expand",
             "ra_ide",
@@ -153,9 +190,9 @@ impl TidyDocs {
         ];
 
         let mut has_fixmes =
-            whitelist.iter().map(|it| (*it, false)).collect::<HashMap<&str, bool>>();
+            poorly_documented.iter().map(|it| (*it, false)).collect::<HashMap<&str, bool>>();
         'outer: for path in self.contains_fixme {
-            for krate in whitelist.iter() {
+            for krate in poorly_documented.iter() {
                 if path.components().any(|it| it.as_os_str() == *krate) {
                     has_fixmes.insert(krate, true);
                     continue 'outer;
@@ -166,7 +203,7 @@ impl TidyDocs {
 
         for (krate, has_fixme) in has_fixmes.iter() {
             if !has_fixme {
-                panic!("crate {} is fully documented, remove it from the white list", krate)
+                panic!("crate {} is fully documented :tada:, remove it from the list of poorly documented crates", krate)
             }
         }
     }