Move cfg attrs up to the mod definitions to disable sourcegen

Author: fasterthanlime

src/tools/rust-analyzer/crates/ide-assists/src/tests.rs

@@ -1,5 +1,6 @@
-mod sourcegen;
 mod generated;
+#[cfg(not(feature = "in-rust-tree"))]
+mod sourcegen;
 
 use expect_test::expect;
 use hir::{db::DefDatabase, Semantics};

src/tools/rust-analyzer/crates/ide-assists/src/tests/sourcegen.rs

@@ -1,12 +1,9 @@
 //! Generates `assists.md` documentation.
 
-#[cfg(not(feature = "in-rust-tree"))]
 use std::{fmt, fs, path::Path};
 
-#[cfg(not(feature = "in-rust-tree"))]
 use test_utils::project_root;
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[test]
 fn sourcegen_assists_docs() {
     let assists = Assist::collect();
@@ -63,23 +60,20 @@ r#####"
     }
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Debug)]
 struct Section {
     doc: String,
     before: String,
     after: String,
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Debug)]
 struct Assist {
     id: String,
     location: sourcegen::Location,
     sections: Vec<Section>,
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 impl Assist {
     fn collect() -> Vec<Assist> {
         let handlers_dir = project_root().join("crates/ide-assists/src/handlers");
@@ -144,7 +138,6 @@ impl Assist {
     }
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 impl fmt::Display for Assist {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let _ = writeln!(
@@ -179,15 +172,13 @@ impl fmt::Display for Assist {
     }
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 fn hide_hash_comments(text: &str) -> String {
     text.split('\n') // want final newline
         .filter(|&it| !(it.starts_with("# ") || it == "#"))
         .map(|it| format!("{}\n", it))
         .collect()
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 fn reveal_hash_comments(text: &str) -> String {
     text.split('\n') // want final newline
         .map(|it| {

src/tools/rust-analyzer/crates/ide-diagnostics/src/tests.rs

@@ -1,3 +1,4 @@
+#[cfg(not(feature = "in-rust-tree"))]
 mod sourcegen;
 
 use expect_test::Expect;

src/tools/rust-analyzer/crates/ide-diagnostics/src/tests/sourcegen.rs

@@ -1,12 +1,9 @@
 //! Generates `assists.md` documentation.
 
-#[cfg(not(feature = "in-rust-tree"))]
 use std::{fmt, fs, io, path::PathBuf};
 
-#[cfg(not(feature = "in-rust-tree"))]
 use sourcegen::project_root;
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[test]
 fn sourcegen_diagnostic_docs() {
     let diagnostics = Diagnostic::collect().unwrap();
@@ -17,15 +14,13 @@ fn sourcegen_diagnostic_docs() {
     fs::write(&dst, &contents).unwrap();
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Debug)]
 struct Diagnostic {
     id: String,
     location: sourcegen::Location,
     doc: String,
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 impl Diagnostic {
     fn collect() -> io::Result<Vec<Diagnostic>> {
         let handlers_dir = project_root().join("crates/ide-diagnostics/src/handlers");
@@ -56,7 +51,6 @@ impl Diagnostic {
     }
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 fn is_valid_diagnostic_name(diagnostic: &str) -> Result<(), String> {
     let diagnostic = diagnostic.trim();
     if diagnostic.find(char::is_whitespace).is_some() {
@@ -72,7 +66,6 @@ fn is_valid_diagnostic_name(diagnostic: &str) -> Result<(), String> {
     Ok(())
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 impl fmt::Display for Diagnostic {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         writeln!(f, "=== {}\n**Source:** {}\n{}", self.id, self.location, self.doc)

src/tools/rust-analyzer/crates/rust-analyzer/tests/slow-tests/main.rs

@@ -10,10 +10,11 @@
 
 #![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
 
+#[cfg(not(feature = "in-rust-tree"))]
 mod sourcegen;
-mod tidy;
-mod testdir;
 mod support;
+mod testdir;
+mod tidy;
 
 use std::{collections::HashMap, path::PathBuf, time::Instant};
 

src/tools/rust-analyzer/crates/rust-analyzer/tests/slow-tests/sourcegen.rs

@@ -1,9 +1,7 @@
 //! Generates `assists.md` documentation.
 
-#[cfg(not(feature = "in-rust-tree"))]
 use std::{fmt, fs, io, path::PathBuf};
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[test]
 fn sourcegen_feature_docs() {
     let features = Feature::collect().unwrap();
@@ -19,15 +17,13 @@ fn sourcegen_feature_docs() {
     fs::write(&dst, &contents).unwrap();
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Debug)]
 struct Feature {
     id: String,
     location: sourcegen::Location,
     doc: String,
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 impl Feature {
     fn collect() -> io::Result<Vec<Feature>> {
         let crates_dir = sourcegen::project_root().join("crates");
@@ -58,7 +54,6 @@ impl Feature {
     }
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 fn is_valid_feature_name(feature: &str) -> Result<(), String> {
     'word: for word in feature.split_whitespace() {
         for short in ["to", "and"] {
@@ -78,7 +73,6 @@ fn is_valid_feature_name(feature: &str) -> Result<(), String> {
     Ok(())
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 impl fmt::Display for Feature {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         writeln!(f, "=== {}\n**Source:** {}\n{}", self.id, self.location, self.doc)

src/tools/rust-analyzer/crates/syntax/src/tests.rs

@@ -1,3 +1,4 @@
+#[cfg(not(feature = "in-rust-tree"))]
 mod ast_src;
 #[cfg(not(feature = "in-rust-tree"))]
 mod sourcegen_ast;

src/tools/rust-analyzer/crates/syntax/src/tests/ast_src.rs

@@ -1,6 +1,5 @@
 //! Defines input for code generation process.
 
-#[cfg(not(feature = "in-rust-tree"))]
 pub(crate) struct KindsSrc<'a> {
     pub(crate) punct: &'a [(&'a str, &'a str)],
     pub(crate) keywords: &'a [&'a str],
@@ -10,7 +9,6 @@ pub(crate) struct KindsSrc<'a> {
     pub(crate) nodes: &'a [&'a str],
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 pub(crate) const KINDS_SRC: KindsSrc<'_> = KindsSrc {
     punct: &[
         (";", "SEMICOLON"),
@@ -218,15 +216,13 @@ pub(crate) const KINDS_SRC: KindsSrc<'_> = KindsSrc {
     ],
 };
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Default, Debug)]
 pub(crate) struct AstSrc {
     pub(crate) tokens: Vec<String>,
     pub(crate) nodes: Vec<AstNodeSrc>,
     pub(crate) enums: Vec<AstEnumSrc>,
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Debug)]
 pub(crate) struct AstNodeSrc {
     pub(crate) doc: Vec<String>,
@@ -235,21 +231,18 @@ pub(crate) struct AstNodeSrc {
     pub(crate) fields: Vec<Field>,
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Debug, Eq, PartialEq)]
 pub(crate) enum Field {
     Token(String),
     Node { name: String, ty: String, cardinality: Cardinality },
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Debug, Eq, PartialEq)]
 pub(crate) enum Cardinality {
     Optional,
     Many,
 }
 
-#[cfg(not(feature = "in-rust-tree"))]
 #[derive(Debug)]
 pub(crate) struct AstEnumSrc {
     pub(crate) doc: Vec<String>,