Merge #10525

10525: Regenerate lints and features r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>

Cargo.lock

@@ -659,11 +659,13 @@ dependencies = [
  "profile",
  "rayon",
  "rustc-hash",
+ "sourcegen",
  "stdx",
  "syntax",
  "test_utils",
  "text_edit",
  "tracing",
+ "xshell",
 ]
 
 [[package]]

crates/ide_completion/src/tests.rs

@@ -17,7 +17,6 @@ mod pattern;
 mod predicate;
 mod proc_macros;
 mod record;
-mod sourcegen;
 mod type_pos;
 mod use_tree;
 mod visibility;

crates/ide_db/Cargo.toml

@@ -31,4 +31,6 @@ limit = { path = "../limit", version = "0.0.0" }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
+sourcegen = { path = "../sourcegen" }
+xshell = "0.1"
 expect-test = "1.2.0-pre.1"

crates/ide_db/src/lib.rs

@@ -3,6 +3,7 @@
 //! It is mainly a `HirDatabase` for semantic analysis, plus a `SymbolsDatabase`, for fuzzy search.
 
 mod apply_change;
+
 pub mod assists;
 pub mod label;
 pub mod line_index;
@@ -161,3 +162,8 @@ pub enum SymbolKind {
     ValueParam,
     Variant,
 }
+
+#[cfg(test)]
+mod tests {
+    mod sourcegen_lints;
+}

crates/ide_db/src/tests/sourcegen_lints.rs

@@ -15,13 +15,15 @@ fn sourcegen_lint_completions() {
         cmd!("git clone --depth=1 https://github.com/rust-lang/rust {rust_repo}").run().unwrap();
     }
 
-    let mut contents = r"
+    let mut contents = String::from(
+        r"
 pub struct Lint {
     pub label: &'static str,
     pub description: &'static str,
 }
-"
-    .to_string();
+",
+    );
+
     generate_lint_descriptor(&mut contents);
     contents.push('\n');
 
@@ -34,8 +36,7 @@ pub struct Lint {
         .unwrap();
     generate_descriptor_clippy(&mut contents, &lints_json);
 
-    let contents =
-        sourcegen::add_preamble("sourcegen_lint_completions", sourcegen::reformat(contents));
+    let contents = sourcegen::add_preamble("sourcegen_lints", sourcegen::reformat(contents));
 
     let destination = project_root().join("crates/ide_db/src/helpers/generated_lints.rs");
     sourcegen::ensure_file_contents(destination.as_path(), &contents);
@@ -117,29 +118,23 @@ fn generate_descriptor_clippy(buf: &mut String, path: &Path) {
     let mut clippy_lints: Vec<ClippyLint> = Vec::new();
 
     for line in file_content.lines().map(|line| line.trim()) {
-        if line.starts_with(r#""id":"#) {
+        if let Some(line) = line.strip_prefix(r#""id": ""#) {
             let clippy_lint = ClippyLint {
-                id: line
-                    .strip_prefix(r#""id": ""#)
-                    .expect("should be prefixed by id")
-                    .strip_suffix(r#"","#)
-                    .expect("should be suffixed by comma")
-                    .into(),
+                id: line.strip_suffix(r#"","#).expect("should be suffixed by comma").into(),
                 help: String::new(),
             };
             clippy_lints.push(clippy_lint)
-        } else if line.starts_with(r#""What it does":"#) {
-            // Typical line to strip: "What is doest": "Here is my useful content",
-            let prefix_to_strip = r#""What it does": ""#;
-            let suffix_to_strip = r#"","#;
+        } else if let Some(line) = line.strip_prefix(r#""docs": ""#) {
+            let prefix_to_strip = r#" ### What it does"#;
+            // FIXME: replace unwrap_or with expect again, currently there is one lint that uses a different format in the json...
+            let line = line.strip_prefix(prefix_to_strip).unwrap_or(line);
+            // Only take the description, any more than this is a lot of additional data we would embed into the exe
+            // which seems unnecessary
+            let up_to = line.find(r#"###"#).expect("no second section found?");
+            let line = &line[..up_to];
 
             let clippy_lint = clippy_lints.last_mut().expect("clippy lint must already exist");
-            clippy_lint.help = line
-                .strip_prefix(prefix_to_strip)
-                .expect("should be prefixed by what it does")
-                .strip_suffix(suffix_to_strip)
-                .map(unescape)
-                .expect("should be suffixed by comma");
+            clippy_lint.help = unescape(line).trim().to_string();
         }
     }
     clippy_lints.sort_by(|lint, lint2| lint.id.cmp(&lint2.id));

crates/rust-analyzer/tests/slow-tests/tidy.rs

@@ -342,7 +342,7 @@ fn check_test_attrs(path: &Path, text: &str) {
         // :(
         "hir_def/src/nameres/collector.rs",
         // Long sourcegen test to generate lint completions.
-        "ide_completion/src/tests/sourcegen.rs",
+        "ide_db/src/tests/sourcegen_lints.rs",
         // Obviously needs ignore.
         "ide_assists/src/handlers/toggle_ignore.rs",
         // See above.