Don't extract non-source crates

Author: aibaars

rust/extractor/src/main.rs

@@ -65,6 +65,9 @@ fn main() -> anyhow::Result<()> {
         let crates = <dyn DefDatabase>::crate_graph(&db);
         for crate_id in crates.iter() {
             let krate = Crate::from(crate_id);
+            if !cfg.extract_dependencies && !krate.origin(&db).is_local() {
+                continue;
+            }
             let name = krate.display_name(&db);
             let crate_name = name
                 .as_ref()
@@ -78,16 +81,9 @@ fn main() -> anyhow::Result<()> {
                     crate_id.into_raw().into_u32()
                 )),
             );
-            translate::CrateTranslator::new(
-                &db,
-                trap,
-                &krate,
-                &vfs,
-                &archiver,
-                cfg.extract_dependencies,
-            )
-            .emit_crate()
-            .context("writing trap file")?;
+            translate::CrateTranslator::new(&db, trap, &krate, &vfs, &archiver)
+                .emit_crate()
+                .context("writing trap file")?;
         }
     }
     Ok(())

rust/extractor/src/translate.rs

@@ -32,7 +32,6 @@ pub struct CrateTranslator<'a> {
     krate: &'a Crate,
     vfs: &'a Vfs,
     archiver: &'a Archiver,
-    extract_dependencies: bool,
     file_labels: HashMap<PathBuf, FileData>,
 }
 
@@ -43,15 +42,13 @@ impl CrateTranslator<'_> {
         krate: &'a Crate,
         vfs: &'a Vfs,
         archiver: &'a Archiver,
-        extract_dependencies: bool,
     ) -> CrateTranslator<'a> {
         CrateTranslator {
             db,
             trap,
             krate,
             vfs,
             archiver,
-            extract_dependencies,
             file_labels: HashMap::new(),
         }
     }
@@ -942,17 +939,11 @@ impl CrateTranslator<'_> {
                 let name = function.name(self.db);
                 let location = self.emit_location(function);
 
-                let body = if self.extract_dependencies || self.krate.origin(self.db).is_local() {
-                    let (body, source_map) = self.db.body_with_source_map(def.into());
-                    let txt = body.pretty_print(self.db, def.into(), Edition::Edition2021);
-                    log::trace!("{}", &txt);
-                    self.emit_expr(body.body_expr, &body, &source_map)
-                } else {
-                    self.trap.emit(generated::MissingExpr {
-                        id: TrapId::Star,
-                        location: None,
-                    })
-                };
+                let (body, source_map) = self.db.body_with_source_map(def.into());
+                let txt = body.pretty_print(self.db, def.into(), Edition::Edition2021);
+                log::trace!("{}", &txt);
+                let body = self.emit_expr(body.body_expr, &body, &source_map);
+
                 labels.push(self.trap.emit(generated::Function {
                     id: trap_key![module_label, name.as_str()],
                     location,