update salsa

Author: ibraheemdev

Cargo.lock

@@ -137,7 +137,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/ibraheemdev/salsa", rev = "02b9ae4dbbacf51aea49c966a5119c9de02e9589" }
+salsa = { git = "https://github.com/salsa-rs/salsa", rev = "0666e2018bc35376b1ac4f98906f2d04d11e5fe4" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }

Cargo.toml

@@ -463,7 +463,7 @@ fn setup_rayon() {
 
 /// Dumps memory usage information to the CLI.
 #[allow(clippy::print_stdout)]
-fn salsa_memory_dump(db: &ProjectDatabase) -> SalsaMemoryDump<'_> {
+fn salsa_memory_dump(db: &ProjectDatabase) -> SalsaMemoryDump {
     println!("Counts for entire CLI run:\n{}", countme::get_all());
 
     let salsa_db = db as &dyn salsa::Database;
@@ -477,15 +477,15 @@ fn salsa_memory_dump(db: &ProjectDatabase) -> SalsaMemoryDump<'_> {
     SalsaMemoryDump { ingredients, memos }
 }
 
-struct SalsaMemoryDump<'db> {
+struct SalsaMemoryDump {
     ingredients: Vec<salsa::IngredientInfo>,
-    memos: Vec<((&'db str, &'db str), salsa::IngredientInfo)>,
+    memos: Vec<(&'static str, salsa::IngredientInfo)>,
 }
 
 #[allow(clippy::cast_precision_loss)]
-impl SalsaMemoryDump<'_> {
+impl SalsaMemoryDump {
     fn display_short(&self) -> impl Display + '_ {
-        struct DisplayShort<'a>(&'a SalsaMemoryDump<'a>);
+        struct DisplayShort<'a>(&'a SalsaMemoryDump);
 
         impl std::fmt::Display for DisplayShort<'_> {
             fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -498,7 +498,7 @@ impl SalsaMemoryDump<'_> {
 
                 let mut total_memo_fields = 0;
                 let mut total_memo_metadata = 0;
-                for ((_, _), memo) in &self.0.memos {
+                for (_, memo) in &self.0.memos {
                     total_memo_fields += memo.size_of_fields();
                     total_memo_metadata += memo.size_of_metadata();
                 }
@@ -545,7 +545,7 @@ impl SalsaMemoryDump<'_> {
     }
 
     fn display_full(&self) -> impl Display + '_ {
-        struct DisplayFull<'a>(&'a SalsaMemoryDump<'a>);
+        struct DisplayFull<'a>(&'a SalsaMemoryDump);
 
         impl std::fmt::Display for DisplayFull<'_> {
             fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -571,11 +571,11 @@ impl SalsaMemoryDump<'_> {
 
                 let mut total_memo_fields = 0;
                 let mut total_memo_metadata = 0;
-                for ((input, output), memo) in &self.0.memos {
+                for (query_fn, memo) in &self.0.memos {
                     total_memo_fields += memo.size_of_fields();
                     total_memo_metadata += memo.size_of_metadata();
 
-                    writeln!(f, "`{input} -> {output}`")?;
+                    writeln!(f, "`{query_fn} -> {}`", memo.debug_name())?;
 
                     writeln!(
                         f,

crates/ty/src/lib.rs

@@ -30,7 +30,7 @@ ty_python_semantic = { path = "../crates/ty_python_semantic" }
 ty_vendored = { path = "../crates/ty_vendored" }
 
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false }
-salsa = { git = "https://github.com/ibraheemdev/salsa", rev = "02b9ae4dbbacf51aea49c966a5119c9de02e9589" }
+salsa = { git = "https://github.com/ibraheemdev/salsa", rev = "e53c2ab7" }
 similar = { version = "2.5.0" }
 tracing = { version = "0.1.40" }