Remove indexing_v1 and lowering_v1

Author: purefunctor

Cargo.lock

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 dashmap = "6.1.0"
 id = { version = "0.1.0", path = "../id" }
-indexing_v1 = { version = "0.1.0", path = "../indexing_v1" }
+indexing = { version = "0.1.0", path = "../indexing" }
 indexmap = "2.7.1"
 lexing = { version = "0.1.0", path = "../lexing" }
 parking_lot = "0.12.3"

crates/building/Cargo.toml

@@ -1,6 +1,6 @@
 use std::{mem, sync::Arc};
 
-use indexing_v1::IndexingResult;
+use indexing::FullModuleIndex;
 use rowan::ast::AstNode;
 use rustc_hash::{FxHashMap, FxHashSet};
 use syntax::cst;
@@ -38,7 +38,7 @@ pub struct Runtime {
 
     content: FxHashMap<FileId, Arc<str>>,
     parse: FxHashMap<FileId, cst::Module>,
-    index: FxHashMap<FileId, Arc<IndexingResult>>,
+    index: FxHashMap<FileId, Arc<FullModuleIndex>>,
 
     parent: Option<QueryKey>,
     dependencies: FxHashMap<QueryKey, FxHashSet<QueryKey>>,
@@ -164,13 +164,13 @@ impl Runtime {
         )
     }
 
-    pub fn index(&mut self, id: FileId) -> Arc<IndexingResult> {
+    pub fn index(&mut self, id: FileId) -> Arc<FullModuleIndex> {
         let k = QueryKey::Index(id);
         self.query(
             k,
             |this| {
                 let module = this.parse(id);
-                let (result, _) = indexing_v1::index(&module);
+                let result = indexing::index_module(&module);
                 Arc::new(result)
             },
             |this| {

crates/building/src/base.rs

@@ -8,7 +8,14 @@ pub use source::*;
 
 use syntax::cst;
 
-pub fn index_module(module: &cst::Module) -> (Index, Relational, IndexingSource, Vec<IndexError>) {
+pub struct FullModuleIndex {
+    pub index: Index,
+    pub relational: Relational,
+    pub source: IndexingSource,
+    pub error: Vec<IndexError>,
+}
+
+pub fn index_module(module: &cst::Module) -> FullModuleIndex {
     let algorithm::State { index, relational, source, error } = algorithm::index_module(module);
-    (index, relational, source, error)
+    FullModuleIndex { index, relational, source, error }
 }

crates/indexing/src/lib.rs

@@ -1,4 +1,4 @@
-use indexing::{index_module, Index, IndexError, IndexingSource, Relational};
+use indexing::{index_module, FullModuleIndex, Index, IndexError, IndexingSource, Relational};
 use rowan::ast::AstNode;
 use std::fmt::Write;
 use syntax::cst;
@@ -11,17 +11,17 @@ fn index_source(source: &str) -> (cst::Module, Index, Relational, IndexingSource
     let (module, _) = parsing::parse(&lexed, &tokens);
     let module = cst::Module::cast(module).unwrap();
 
-    let (index, relational, source, errors) = index_module(&module);
-    (module, index, relational, source, errors)
+    let FullModuleIndex { index, relational, source, error } = index_module(&module);
+    (module, index, relational, source, error)
 }
 
 test_each_file! { in "./crates/indexing/tests/indexing" => |source: &str| {
-    let (_, index, relational, source, errors) = index_source(source);
+    let (_, index, relational, source, error) = index_source(source);
 
     let mut snapshot = String::new();
     writeln!(snapshot, "{:#?}", index).unwrap();
     writeln!(snapshot, "{:#?}", relational).unwrap();
     writeln!(snapshot, "{:#?}", source).unwrap();
-    writeln!(snapshot, "{:#?}", errors).unwrap();
+    writeln!(snapshot, "{:#?}", error).unwrap();
     insta::assert_snapshot!(snapshot);
 }}