Rust: fixes

Author: aibaars

rust/ast-generator/templates/extractor.mustache

@@ -34,8 +34,9 @@ impl Translator<'_> {
     {{#nodes}}
 
     pub(crate) fn emit_{{snake_case_name}}(&mut self, node: &ast::{{ast_name}}) -> Option<Label<generated::{{name}}>> {
-        {{#has_attrs}}
         if self.should_be_excluded(node) { return None; }
+        {{#has_attrs}}
+        if self.should_be_excluded_attrs(node) { return None; }
         {{/has_attrs}}
         {{#fields}}
         {{#predicate}}

rust/extractor/src/diagnostics.rs

@@ -1,4 +1,5 @@
 use crate::config::Config;
+use crate::translate::SourceKind;
 use anyhow::Context;
 use chrono::{DateTime, Utc};
 use ra_ap_project_model::ProjectManifest;
@@ -83,6 +84,8 @@ pub enum ExtractionStepKind {
     LoadSource,
     Parse,
     Extract,
+    ParseLibrary,
+    ExtractLibrary,
     CrateGraph,
 }
 
@@ -113,18 +116,24 @@ impl ExtractionStep {
         )
     }
 
-    pub fn parse(start: Instant, target: &Path) -> Self {
+    pub fn parse(start: Instant, source_kind: SourceKind, target: &Path) -> Self {
         Self::new(
             start,
-            ExtractionStepKind::Parse,
+            match source_kind {
+                SourceKind::Source => ExtractionStepKind::Parse,
+                SourceKind::Library => ExtractionStepKind::ParseLibrary,
+            },
             Some(PathBuf::from(target)),
         )
     }
 
-    pub fn extract(start: Instant, target: &Path) -> Self {
+    pub fn extract(start: Instant, source_kind: SourceKind, target: &Path) -> Self {
         Self::new(
             start,
-            ExtractionStepKind::Extract,
+            match source_kind {
+                SourceKind::Source => ExtractionStepKind::Extract,
+                SourceKind::Library => ExtractionStepKind::ExtractLibrary,
+            },
             Some(PathBuf::from(target)),
         )
     }

rust/extractor/src/main.rs

@@ -63,7 +63,8 @@ impl<'a> Extractor<'a> {
             errors,
             semantics_info,
         } = rust_analyzer.parse(file);
-        self.steps.push(ExtractionStep::parse(before_parse, file));
+        self.steps
+            .push(ExtractionStep::parse(before_parse, source_kind, file));
 
         let before_extract = Instant::now();
         let line_index = LineIndex::new(text.as_ref());
@@ -108,7 +109,7 @@ impl<'a> Extractor<'a> {
             )
         });
         self.steps
-            .push(ExtractionStep::extract(before_extract, file));
+            .push(ExtractionStep::extract(before_extract, source_kind, file));
     }
 
     pub fn extract_with_semantics(

rust/extractor/src/translate/base.rs

@@ -93,7 +93,7 @@ pub enum ResolvePaths {
     Yes,
     No,
 }
-#[derive(PartialEq, Eq)]
+#[derive(Copy, Clone, PartialEq, Eq)]
 pub enum SourceKind {
     Source,
     Library,
@@ -619,7 +619,17 @@ impl<'a> Translator<'a> {
         })();
     }
 
-    pub(crate) fn should_be_excluded(&self, item: &impl ast::HasAttrs) -> bool {
+    pub(crate) fn should_be_excluded_attrs(&self, item: &impl ast::HasAttrs) -> bool {
+        self.semantics.is_some_and(|sema| {
+            item.attrs().any(|attr| {
+                attr.as_simple_call().is_some_and(|(name, tokens)| {
+                    name == "cfg" && sema.check_cfg_attr(&tokens) == Some(false)
+                })
+            })
+        })
+    }
+
+    pub(crate) fn should_be_excluded(&self, item: &impl ast::AstNode) -> bool {
         if self.source_kind == SourceKind::Library {
             let syntax = item.syntax();
             if let Some(body) = syntax.parent().and_then(Fn::cast).and_then(|x| x.body()) {
@@ -645,13 +655,7 @@ impl<'a> Translator<'a> {
                 }
             }
         }
-        self.semantics.is_some_and(|sema| {
-            item.attrs().any(|attr| {
-                attr.as_simple_call().is_some_and(|(name, tokens)| {
-                    name == "cfg" && sema.check_cfg_attr(&tokens) == Some(false)
-                })
-            })
-        })
+        return false;
     }
 
     pub(crate) fn extract_types_from_path_segment(