fix: update salsa to fix wasm build

Also updated Rust version to 1.80.0

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", git = "https://github.com/Chronostasys/salsa", branch = "master" }
+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

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.75.0"
+channel = "1.80.0"
 components = ["rustfmt", "clippy"]

immix

@@ -35,7 +35,6 @@ pub struct ModBuffer(pub PLModBuffer);
 pub struct PLModBuffer {
     pub path: PathBuf,
     pub buf: Vec<u8>,
-    pub is_main: bool,
     pub name: String,
 }
 

rust-toolchain.toml

@@ -398,7 +398,7 @@ impl FmtBuilder {
     }
     pub fn parse_take_op_node(&mut self, node: &TakeOpNode) {
         node.head.format(self);
-        for id in &node.field {
+        if let Some(id) = &node.field {
             self.dot();
             id.format(self);
         }

src/ast/accumulators.rs

@@ -734,7 +734,6 @@ pub fn emit_file<'db>(
         ModBuffer(PLModBuffer {
             path: p.to_path_buf(),
             buf,
-            is_main: builder.get_function("main").is_some(),
             name: program_emit_params.file(db).to_string(),
         })
         .accumulate(db);

src/ast/fmt.rs

@@ -25,26 +25,26 @@ pub fn cycle_deps_recover<'db>(
     cycle: &salsa::Cycle,
     _: FileCompileInput,
 ) -> Option<ModWrapper<'db>> {
-    let key = cycle.all_participants(db.as_salsa_database());
+    let key = cycle.all_participants(db.as_dyn_database());
     let mut files = FxHashMap::default();
     let mut prev_use_map = FxHashMap::default();
     let params = cycle
         .participant_keys()
         .enumerate()
         .filter(|(i, _)| {
             let key = key[*i];
-            let name = db.lookup_ingredient(key.ingredient_index()).debug_name();
+            let name = db.ingredient_debug_name(key.ingredient_index());
             name != "compile_dry_file"
         })
-        .map(|(_, k)| Program::lookup_id(k.key_index(), db.as_salsa_database()))
+        .map(|(_, k)| Program::lookup_id(k.key_index(), db.as_dyn_database()))
         .last()
         .unwrap();
     let src_file_path = params.params(db).file(db);
     let mut prev_file = src_file_path;
     build_init_params(params, db, &mut prev_use_map);
     let filtered = cycle.participant_keys().enumerate().filter(|(i, _)| {
         let key = key[*i];
-        let name = db.lookup_ingredient(key.ingredient_index()).debug_name();
+        let name = db.ingredient_debug_name(key.ingredient_index());
         name != "compile_dry_file"
     });
     let len = filtered.count();
@@ -54,10 +54,10 @@ pub fn cycle_deps_recover<'db>(
             .enumerate()
             .filter(|(i, _)| {
                 let key = key[*i];
-                let name = db.lookup_ingredient(key.ingredient_index()).debug_name();
+                let name = db.ingredient_debug_name(key.ingredient_index());
                 name != "compile_dry_file"
             })
-            .map(|(u, k)| (u, Program::lookup_id(k.key_index(), db.as_salsa_database())))
+            .map(|(u, k)| (u, Program::lookup_id(k.key_index(), db.as_dyn_database())))
         {
             let prog = match_node(p, db);
             if let Some(r) = prev_use_map.get(p.params(db).file(db)) {

src/ast/node/program.rs

@@ -29,16 +29,28 @@ pub struct Database {
 // ANCHOR: db_impl
 #[salsa::db]
 impl salsa::Database for Database {
-    fn salsa_event(&self, event: salsa::Event) {
+    fn salsa_event(&self, event: &dyn Fn() -> salsa::Event) {
         // Log interesting events, if logging is enabled
         if let Some(logs) = &self.logs {
+            let event = event();
             // don't log boring events
             if let salsa::EventKind::WillExecute { .. } = event.kind {
                 logs.lock().unwrap().push(format!("Event: {:?}", event));
             }
         }
     }
 }
+
+impl Clone for Database {
+    fn clone(&self) -> Self {
+        Self {
+            storage: self.storage.clone(),
+            logs: self.logs.clone(),
+            ref_str: self.ref_str.clone(),
+            module_map: self.module_map.clone(),
+        }
+    }
+}
 // // ANCHOR_END: db_impl
 
 // // ANCHOR: par_db_impl