diff --git a/Cargo.lock b/Cargo.lock index 447c014c21..bc1f58df06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3194,7 +3194,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "salsa" version = "0.22.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=40d7844a7a7449a136e0946920a678b55a82f30b#40d7844a7a7449a136e0946920a678b55a82f30b" +source = "git+https://github.com/salsa-rs/salsa.git?rev=2b5188778e91a5ab50cb7d827148caf7eb2f4630#2b5188778e91a5ab50cb7d827148caf7eb2f4630" dependencies = [ "boxcar", "compact_str", @@ -3218,12 +3218,12 @@ dependencies = [ [[package]] name = "salsa-macro-rules" version = "0.22.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=40d7844a7a7449a136e0946920a678b55a82f30b#40d7844a7a7449a136e0946920a678b55a82f30b" +source = "git+https://github.com/salsa-rs/salsa.git?rev=2b5188778e91a5ab50cb7d827148caf7eb2f4630#2b5188778e91a5ab50cb7d827148caf7eb2f4630" [[package]] name = "salsa-macros" version = "0.22.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=40d7844a7a7449a136e0946920a678b55a82f30b#40d7844a7a7449a136e0946920a678b55a82f30b" +source = "git+https://github.com/salsa-rs/salsa.git?rev=2b5188778e91a5ab50cb7d827148caf7eb2f4630#2b5188778e91a5ab50cb7d827148caf7eb2f4630" dependencies = [ "heck", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 1b01cf219c..46597dae62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 = "40d7844a7a7449a136e0946920a678b55a82f30b" } +salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "2b5188778e91a5ab50cb7d827148caf7eb2f4630" } schemars = { version = "0.8.16" } seahash = { version = "4.1.0" } serde = { version = "1.0.197", features = ["derive"] } diff --git a/crates/ty_python_semantic/resources/primer/bad.txt b/crates/ty_python_semantic/resources/primer/bad.txt index 43b465e959..da07da7fb2 100644 --- a/crates/ty_python_semantic/resources/primer/bad.txt +++ b/crates/ty_python_semantic/resources/primer/bad.txt @@ -1,27 +1,27 @@ -Tanjun # hangs -antidote # hangs / slow +Tanjun # too many iterations +antidote # hangs / slow (single threaded) 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 +cpython # too many cycle iterations +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 # slow (9s) +pandas-stubs 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 -scikit-learn # success, but mypy-primer hangs processing the output +schemathesis +scikit-learn setuptools # vendors packaging, see above -spack # success, but mypy-primer hangs processing the output +spack # slow, success, but mypy-primer hangs processing the output spark # too many iterations -steam.py # hangs +steam.py # hangs (single threaded) xarray # too many iterations diff --git a/crates/ty_python_semantic/src/types.rs b/crates/ty_python_semantic/src/types.rs index 7704d133c2..0992d479d0 100644 --- a/crates/ty_python_semantic/src/types.rs +++ b/crates/ty_python_semantic/src/types.rs @@ -9200,7 +9200,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; 24]); +static_assertions::assert_eq_size!(Type, [u8; 16]); #[cfg(test)] pub(crate) mod tests { diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 23a9e50b8f..b1671c7bb8 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -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 = "40d7844a7a7449a136e0946920a678b55a82f30b" } +salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "2b5188778e91a5ab50cb7d827148caf7eb2f4630" } similar = { version = "2.5.0" } tracing = { version = "0.1.40" }