Use local salsa

Author: MichaReiser

Cargo.lock

@@ -129,7 +129,7 @@ regex = { version = "1.10.2" }
 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/salsa-rs/salsa.git", rev = "9f7fa33789ec524a66eab8e8ab6a3a0bec3c0bb5" }
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "d980b9e532edbd0ff8570f8c467f8f0a5f3f97e7" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }

Cargo.toml

@@ -13,12 +13,12 @@ pub fn assert_function_query_was_not_run<Db, Q, QDb, I, R>(
     Q: Fn(QDb, I) -> R,
     I: salsa::plumbing::AsId + std::fmt::Debug + Copy,
 {
-    let id = input.as_id().as_u32();
+    let id = input.as_id();
     let (query_name, will_execute_event) = find_will_execute_event(db, query, input, events);
 
     db.attach(|_| {
         if let Some(will_execute_event) = will_execute_event {
-            panic!("Expected query {query_name}({id}) not to have run but it did: {will_execute_event:?}\n\n{events:#?}");
+            panic!("Expected query {query_name}({id:?}) not to have run but it did: {will_execute_event:?}\n\n{events:#?}");
         }
     });
 }
@@ -65,7 +65,7 @@ pub fn assert_function_query_was_run<Db, Q, QDb, I, R>(
     Q: Fn(QDb, I) -> R,
     I: salsa::plumbing::AsId + std::fmt::Debug + Copy,
 {
-    let id = input.as_id().as_u32();
+    let id = input.as_id();
     let (query_name, will_execute_event) = find_will_execute_event(db, query, input, events);
 
     db.attach(|_| {

crates/ruff_db/src/testing.rs

@@ -4,24 +4,24 @@ artigraph  # cycle panics (value_type_)
 arviz  # too many iterations on versions of arviz newer than https://github.com/arviz-devs/arviz/commit/3205b82bb4d6097c31f7334d7ac51a6de37002d0
 core  # cycle panics (value_type_)
 cpython  # access to field whilst being initialized, too many cycle iterations
-discord.py  # some kind of hang, only when multi-threaded?
-freqtrade  # hangs
+discord.py
+freqtrade
 hydpy  # too many iterations
 ibis  # too many iterations
 jax  # too many iterations
 packaging  # too many iterations
 pandas  # slow
-pandas-stubs  # hangs/slow, or else https://github.com/salsa-rs/salsa/issues/831
+pandas-stubs  # hangs (sometimes) with 7 or more threads
 pandera  # stack overflow
 pip  # vendors packaging, see above
-prefect # slow
+prefect
 pylint  # cycle panics (self-recursive type alias)
 pyodide  # too many cycle iterations
 pywin32  # bad use-def map (binding with definitely-visible unbound)
-schemathesis  # https://github.com/salsa-rs/salsa/issues/831
+schemathesis
 scikit-learn  # success, but mypy-primer hangs processing the output
 setuptools  # vendors packaging, see above
 spack  # success, but mypy-primer hangs processing the output
 spark  # too many iterations
-steam.py  # hangs
+steam.py  # hangs (single threaded)
 xarray  # too many iterations

crates/ty_python_semantic/resources/primer/bad.txt

@@ -9026,7 +9026,7 @@ impl<'db> BoundSuperType<'db> {
 // Make sure that the `Type` enum does not grow unexpectedly.
 #[cfg(not(debug_assertions))]
 #[cfg(target_pointer_width = "64")]
-static_assertions::assert_eq_size!(Type, [u8; 16]);
+static_assertions::assert_eq_size!(Type, [u8; 24]);
 
 #[cfg(test)]
 pub(crate) mod tests {

crates/ty_python_semantic/src/types.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/salsa-rs/salsa.git", rev = "4818b15f3b7516555d39f5a41cb75970448bee4c" }
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "d980b9e532edbd0ff8570f8c467f8f0a5f3f97e7" }
 similar = { version = "2.5.0" }
 tracing = { version = "0.1.40" }