diff --git a/Cargo.lock b/Cargo.lock index caf056e56dff5..4f82482a6edb7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3621,7 +3621,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "salsa" version = "0.25.2" -source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3" +source = "git+https://github.com/salsa-rs/salsa.git?rev=0298d2951e45ccf1450f1a09fb379dc7e48ddee9#0298d2951e45ccf1450f1a09fb379dc7e48ddee9" dependencies = [ "boxcar", "compact_str", @@ -3646,12 +3646,12 @@ dependencies = [ [[package]] name = "salsa-macro-rules" version = "0.25.2" -source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3" +source = "git+https://github.com/salsa-rs/salsa.git?rev=0298d2951e45ccf1450f1a09fb379dc7e48ddee9#0298d2951e45ccf1450f1a09fb379dc7e48ddee9" [[package]] name = "salsa-macros" version = "0.25.2" -source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3" +source = "git+https://github.com/salsa-rs/salsa.git?rev=0298d2951e45ccf1450f1a09fb379dc7e48ddee9#0298d2951e45ccf1450f1a09fb379dc7e48ddee9" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index d79b74610ea42..803a0cfcc03f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -147,7 +147,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/salsa-rs/salsa.git", rev = "ce80691fa0b87dc2fd2235a26544e63e5e43d8d3", default-features = false, features = [ +salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "0298d2951e45ccf1450f1a09fb379dc7e48ddee9", default-features = false, features = [ "compact_str", "macros", "salsa_unstable", diff --git a/crates/ruff_db/src/testing.rs b/crates/ruff_db/src/testing.rs index 1ed58f1977c23..f0a97a0769e39 100644 --- a/crates/ruff_db/src/testing.rs +++ b/crates/ruff_db/src/testing.rs @@ -37,7 +37,7 @@ pub fn assert_const_function_query_was_not_run( let event = events.iter().find(|event| { if let salsa::EventKind::WillExecute { database_key } = event.kind { - db.ingredient_debug_name(database_key.ingredient_index()) == query_name + db.ingredient_debug_name(database_key.ingredient_index(db.zalsa())) == query_name } else { false } @@ -89,7 +89,7 @@ where let event = events.iter().find(|event| { if let salsa::EventKind::WillExecute { database_key } = event.kind { - db.ingredient_debug_name(database_key.ingredient_index()) == query_name + db.ingredient_debug_name(database_key.ingredient_index(db.zalsa())) == query_name && database_key.key_index() == input.as_id() } else { false