Update Salsa part 1 (#16340)

This commit is contained in:
Micha Reiser 2025-02-24 08:35:21 +00:00 committed by GitHub
parent bc018bf2e5
commit 5eaf225fc3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 7 deletions

6
Cargo.lock generated
View File

@ -3323,7 +3323,7 @@ checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
[[package]] [[package]]
name = "salsa" name = "salsa"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/salsa-rs/salsa.git?rev=c8826fa4d1d9e3cba4c6e578763878b71fa9a10d#c8826fa4d1d9e3cba4c6e578763878b71fa9a10d" source = "git+https://github.com/salsa-rs/salsa.git?rev=97ea5581e1bdec72d5deb383d555e45928e54f9d#97ea5581e1bdec72d5deb383d555e45928e54f9d"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"boxcar", "boxcar",
@ -3345,12 +3345,12 @@ dependencies = [
[[package]] [[package]]
name = "salsa-macro-rules" name = "salsa-macro-rules"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/salsa-rs/salsa.git?rev=c8826fa4d1d9e3cba4c6e578763878b71fa9a10d#c8826fa4d1d9e3cba4c6e578763878b71fa9a10d" source = "git+https://github.com/salsa-rs/salsa.git?rev=97ea5581e1bdec72d5deb383d555e45928e54f9d#97ea5581e1bdec72d5deb383d555e45928e54f9d"
[[package]] [[package]]
name = "salsa-macros" name = "salsa-macros"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/salsa-rs/salsa.git?rev=c8826fa4d1d9e3cba4c6e578763878b71fa9a10d#c8826fa4d1d9e3cba4c6e578763878b71fa9a10d" source = "git+https://github.com/salsa-rs/salsa.git?rev=97ea5581e1bdec72d5deb383d555e45928e54f9d#97ea5581e1bdec72d5deb383d555e45928e54f9d"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",

View File

@ -123,7 +123,7 @@ rayon = { version = "1.10.0" }
regex = { version = "1.10.2" } regex = { version = "1.10.2" }
rustc-hash = { version = "2.0.0" } rustc-hash = { version = "2.0.0" }
# When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml` # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "c8826fa4d1d9e3cba4c6e578763878b71fa9a10d" } salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "97ea5581e1bdec72d5deb383d555e45928e54f9d" }
schemars = { version = "0.8.16" } schemars = { version = "0.8.16" }
seahash = { version = "4.1.0" } seahash = { version = "4.1.0" }
serde = { version = "1.0.197", features = ["derive"] } serde = { version = "1.0.197", features = ["derive"] }

View File

@ -41,7 +41,6 @@ pub(crate) struct Unpack<'db> {
/// The ingredient representing the value expression of the unpacking. For example, in /// The ingredient representing the value expression of the unpacking. For example, in
/// `(a, b) = (1, 2)`, the value expression is `(1, 2)`. /// `(a, b) = (1, 2)`, the value expression is `(1, 2)`.
#[no_eq]
pub(crate) value: UnpackValue<'db>, pub(crate) value: UnpackValue<'db>,
count: countme::Count<Unpack<'static>>, count: countme::Count<Unpack<'static>>,
@ -60,7 +59,7 @@ impl<'db> Unpack<'db> {
} }
/// The expression that is being unpacked. /// The expression that is being unpacked.
#[derive(Clone, Copy, Debug, Hash)] #[derive(Clone, Copy, Debug, Hash, salsa::Update)]
pub(crate) enum UnpackValue<'db> { pub(crate) enum UnpackValue<'db> {
/// An iterable expression like the one in a `for` loop or a comprehension. /// An iterable expression like the one in a `for` loop or a comprehension.
Iterable(Expression<'db>), Iterable(Expression<'db>),

View File

@ -29,7 +29,7 @@ ruff_python_formatter = { path = "../crates/ruff_python_formatter" }
ruff_text_size = { path = "../crates/ruff_text_size" } ruff_text_size = { path = "../crates/ruff_text_size" }
libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false } libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false }
salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "c8826fa4d1d9e3cba4c6e578763878b71fa9a10d" } salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "97ea5581e1bdec72d5deb383d555e45928e54f9d" }
similar = { version = "2.5.0" } similar = { version = "2.5.0" }
tracing = { version = "0.1.40" } tracing = { version = "0.1.40" }