chore: update salsa to the latest version

Well, previous salsa version has a [serious bug](salsa-rs/salsa#473)
which makes lsp deadlock from time to time,
I've fixed it in April, but somehow forget to update salsa orz.

Author: Chronostasys

Cargo.lock

@@ -41,7 +41,7 @@ lsp-server = "0.7"
 serde_json = "1.0"
 rustc-hash = "1.1"
 crossbeam-channel = "0.5"
-salsa = { package = "salsa-2022", git = "https://github.com/salsa-rs/salsa", rev = "4151b09d3c37e50f1a01894fcdfa776bc2909132" }
+salsa = { package = "salsa", git = "https://github.com/salsa-rs/salsa", branch = "master" }
 enum_dispatch = "0.3"
 threadpool = { version = "1.8", optional = true }
 dunce = "1.0"

Cargo.toml

@@ -8,28 +8,28 @@ use lsp_types::{
 use super::diag::PLDiag;
 
 #[salsa::accumulator]
-pub struct Diagnostics((String, Vec<PLDiag>));
+pub struct Diagnostics(pub (String, Vec<PLDiag>));
 
 #[salsa::accumulator]
-pub struct PLReferences(Vec<Location>);
+pub struct PLReferences(pub Vec<Location>);
 
 #[salsa::accumulator]
-pub struct GotoDef(GotoDefinitionResponse);
+pub struct GotoDef(pub GotoDefinitionResponse);
 
 #[salsa::accumulator]
-pub struct Completions(Vec<CompletionItem>);
+pub struct Completions(pub Vec<CompletionItem>);
 
 #[salsa::accumulator]
-pub struct PLSemanticTokens(SemanticTokens);
+pub struct PLSemanticTokens(pub SemanticTokens);
 
 #[salsa::accumulator]
-pub struct PLCodeLens(CodeLens);
+pub struct PLCodeLens(pub CodeLens);
 
 #[salsa::accumulator]
-pub struct PLHover(Hover);
+pub struct PLHover(pub Hover);
 
 #[salsa::accumulator]
-pub struct ModBuffer(PLModBuffer);
+pub struct ModBuffer(pub PLModBuffer);
 
 #[derive(Debug, Clone)]
 pub struct PLModBuffer {
@@ -40,11 +40,11 @@ pub struct PLModBuffer {
 }
 
 #[salsa::accumulator]
-pub struct PLFormat(Vec<TextEdit>);
+pub struct PLFormat(pub Vec<TextEdit>);
 #[salsa::accumulator]
-pub struct Hints(Vec<InlayHint>);
+pub struct Hints(pub Vec<InlayHint>);
 #[salsa::accumulator]
-pub struct DocSymbols(Vec<DocumentSymbol>);
+pub struct DocSymbols(pub Vec<DocumentSymbol>);
 
 #[salsa::accumulator]
-pub struct PLSignatureHelp(SignatureHelp);
+pub struct PLSignatureHelp(pub SignatureHelp);

src/ast/accumulators.rs

@@ -2040,12 +2040,13 @@ impl<'a, 'ctx> IRBuilder<'a, 'ctx> for LLVMBuilder<'a, 'ctx> {
             Err(format!("{:?}\ntp: {:?}\nindex: {}", gep, tp, index))
         }
     }
-    fn place_safepoint(&self, ctx: &mut Ctx<'a>) {
-        let f = self.get_gc_mod_f(ctx, "DioGC__safepoint");
-        let rsp = self.get_sp();
-        self.builder
-            .build_call(f, &[rsp.into()], "safepoint")
-            .unwrap();
+    fn place_safepoint(&self, _ctx: &mut Ctx<'a>) {
+        // FIXME
+        // let f = self.get_gc_mod_f(ctx, "DioGC__safepoint");
+        // let rsp = self.get_sp();
+        // self.builder
+        //     .build_call(f, &[rsp.into()], "safepoint")
+        //     .unwrap();
     }
     fn build_store(&self, ptr: ValueHandle, value: ValueHandle) {
         let ptr = self.get_llvm_value(ptr).unwrap();

src/ast/builder/llvmbuilder.rs

@@ -115,7 +115,7 @@ pub fn compile(db: &dyn Db, docs: MemDocsInput, out: String, op: Options) {
 /// compile_dry compiles the source code of pivot-lang into the pivot-lang AST with a wrapper.
 /// the `dry` refers the function ends up parsing at LLVM IR or LSP analysis.
 #[salsa::tracked]
-pub fn compile_dry(db: &dyn Db, docs: MemDocsInput) -> Result<ModWrapper, String> {
+pub fn compile_dry<'db>(db: &'db dyn Db, docs: MemDocsInput) -> Result<ModWrapper<'db>, String> {
     let path = search_config_file(docs.file(db).to_string());
     if path.is_err() {
         log::warn!("lsp error: {}", path.err().unwrap());
@@ -148,7 +148,10 @@ pub fn compile_dry(db: &dyn Db, docs: MemDocsInput) -> Result<ModWrapper, String
 /// compile_dry_file parses the file inside parser_entry into AST,
 /// and then emit the llvm IR code represented by Mod according to the entry file AST.
 #[salsa::tracked(recovery_fn=cycle_deps_recover)]
-pub fn compile_dry_file(db: &dyn Db, parser_entry: FileCompileInput) -> Option<ModWrapper> {
+pub fn compile_dry_file<'db>(
+    db: &'db dyn Db,
+    parser_entry: FileCompileInput<'db>,
+) -> Option<ModWrapper<'db>> {
     if parser_entry.file(db).ends_with(".toml") {
         log::error!("lsp error: toml file {}", parser_entry.file(db));
         // skip toml
@@ -197,7 +200,7 @@ pub fn process_llvm_ir<'a>(
 ) -> (Module<'a>, Vec<PathBuf>) {
     use inkwell::memory_buffer::MemoryBuffer;
 
-    let mods = compile_dry::accumulated::<ModBuffer>(db, docs);
+    let mods: Vec<ModBuffer> = compile_dry::accumulated::<ModBuffer>(db, docs);
 
     let total_steps = 3;
     let pb = ProgressBar::hidden();
@@ -211,6 +214,7 @@ pub fn process_llvm_ir<'a>(
     let llvmmod = ctx.create_module("main");
 
     for m in mods {
+        let m = m.0;
         pb.inc(1);
         let mem = &m.buf;
         let m = m.path;
@@ -370,7 +374,7 @@ pub fn pl_link(llvmmod: Module, oxbjs: Vec<PathBuf>, out: String, op: Options) {
 
 #[cfg(not(feature = "llvm"))]
 #[salsa::tracked]
-pub fn compile(db: &dyn Db, docs: MemDocsInput, out: String, op: Options) {
+pub fn compile(db: &'db dyn Db, docs: MemDocsInput, out: String, op: Options) {
     unimplemented!()
 }
 

src/ast/compiler.rs

@@ -59,10 +59,8 @@ impl HashOptimizationLevel {
 /// lsp action type
 #[derive(Debug, Clone, PartialEq, Eq, Copy, Hash)]
 pub enum ActionType {
-    Completion,
     GotoDef,
     FindReferences,
-    SemanticTokensFull,
     Diagnostic,
     Hover,
     Compile,
@@ -73,5 +71,6 @@ pub enum ActionType {
     Hint,
     DocSymbol,
     SignatureHelp,
-    CodeLens,
+    #[cfg(test)]
+    Completion,
 }

src/ast/compiler/options.rs

@@ -507,9 +507,16 @@ impl<'a> Cache<&str> for PLFileCache<'a> {
 pub(crate) fn ensure_no_error(db: &dyn Db, docs: MemDocsInput) {
     let mut errs_num = 0;
     let mut warn_num = 0;
-    let errs = compile_dry::accumulated::<Diagnostics>(db, docs);
+    let mut errs = compile_dry::accumulated::<Diagnostics>(db, docs);
     if !errs.is_empty() {
-        print_diags(errs, docs, db, &mut errs_num, &mut warn_num, false);
+        print_diags(
+            errs.drain(..).map(|e| e.0).collect(),
+            docs,
+            db,
+            &mut errs_num,
+            &mut warn_num,
+            false,
+        );
         if errs_num > 0 {
             eprintln!(
                 "check failed: {} error(s), {} warning(s)",