mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-11-19 12:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[ty] Update salsa (#21281)

Browse source
This commit is contained in:
Micha Reiser 2025-11-05 23:15:01 +01:00 • committed by GitHub
parent cddc0fedc2
commit 76127e5fb5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -3586,7 +3586,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]] [[package]]
name = "salsa" name = "salsa"
version = "0.24.0" version = "0.24.0"
source = "git+https://github.com/salsa-rs/salsa.git?rev=664750a6e588ed23a0d2d9105a02cb5993c8e178#664750a6e588ed23a0d2d9105a02cb5993c8e178" source = "git+https://github.com/salsa-rs/salsa.git?rev=05a9af7f554b64b8aadc2eeb6f2caf73d0408d09#05a9af7f554b64b8aadc2eeb6f2caf73d0408d09"
dependencies = [ dependencies = [
"boxcar", "boxcar",
"compact_str", "compact_str",
@ -3610,12 +3610,12 @@ dependencies = [
[[package]] [[package]]
name = "salsa-macro-rules" name = "salsa-macro-rules"
version = "0.24.0" version = "0.24.0"
source = "git+https://github.com/salsa-rs/salsa.git?rev=664750a6e588ed23a0d2d9105a02cb5993c8e178#664750a6e588ed23a0d2d9105a02cb5993c8e178" source = "git+https://github.com/salsa-rs/salsa.git?rev=05a9af7f554b64b8aadc2eeb6f2caf73d0408d09#05a9af7f554b64b8aadc2eeb6f2caf73d0408d09"
[[package]] [[package]]
name = "salsa-macros" name = "salsa-macros"
version = "0.24.0" version = "0.24.0"
source = "git+https://github.com/salsa-rs/salsa.git?rev=664750a6e588ed23a0d2d9105a02cb5993c8e178#664750a6e588ed23a0d2d9105a02cb5993c8e178" source = "git+https://github.com/salsa-rs/salsa.git?rev=05a9af7f554b64b8aadc2eeb6f2caf73d0408d09#05a9af7f554b64b8aadc2eeb6f2caf73d0408d09"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

2
Cargo.toml
View file

@ -146,7 +146,7 @@ regex-automata = { version = "0.4.9" }
rustc-hash = { version = "2.0.0" } rustc-hash = { version = "2.0.0" }
rustc-stable-hash = { version = "0.1.2" } rustc-stable-hash = { version = "0.1.2" }
# 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 = "664750a6e588ed23a0d2d9105a02cb5993c8e178", default-features = false, features = [ salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "05a9af7f554b64b8aadc2eeb6f2caf73d0408d09", default-features = false, features = [
"compact_str", "compact_str",
"macros", "macros",
"salsa_unstable", "salsa_unstable",

28
crates/ty_python_semantic/src/types/infer.rs
View file

@ -114,17 +114,15 @@ pub(crate) fn infer_definition_types<'db>(
fn definition_cycle_recover<'db>( fn definition_cycle_recover<'db>(
db: &'db dyn Db, db: &'db dyn Db,
_id: salsa::Id, _id: salsa::Id,
_last_provisional_value: &DefinitionInference<'db>, last_provisional_value: &DefinitionInference<'db>,
_value: &DefinitionInference<'db>, value: DefinitionInference<'db>,
count: u32, count: u32,
definition: Definition<'db>, definition: Definition<'db>,
) -> salsa::CycleRecoveryAction<DefinitionInference<'db>> { ) -> DefinitionInference<'db> {
if count == ITERATIONS_BEFORE_FALLBACK { if &value == last_provisional_value || count != ITERATIONS_BEFORE_FALLBACK {
salsa::CycleRecoveryAction::Fallback(DefinitionInference::cycle_fallback( value
definition.scope(db),
))
} else { } else {
salsa::CycleRecoveryAction::Iterate DefinitionInference::cycle_fallback(definition.scope(db))
} }
} }
@ -230,17 +228,15 @@ pub(crate) fn infer_isolated_expression<'db>(
fn expression_cycle_recover<'db>( fn expression_cycle_recover<'db>(
db: &'db dyn Db, db: &'db dyn Db,
_id: salsa::Id, _id: salsa::Id,
_last_provisional_value: &ExpressionInference<'db>, last_provisional_value: &ExpressionInference<'db>,
_value: &ExpressionInference<'db>, value: ExpressionInference<'db>,
count: u32, count: u32,
input: InferExpression<'db>, input: InferExpression<'db>,
) -> salsa::CycleRecoveryAction<ExpressionInference<'db>> { ) -> ExpressionInference<'db> {
if count == ITERATIONS_BEFORE_FALLBACK { if &value == last_provisional_value || count != ITERATIONS_BEFORE_FALLBACK {
salsa::CycleRecoveryAction::Fallback(ExpressionInference::cycle_fallback( value
input.expression(db).scope(db),
))
} else { } else {
salsa::CycleRecoveryAction::Iterate ExpressionInference::cycle_fallback(input.expression(db).scope(db))
} }
} }

2
fuzz/Cargo.toml
View file

@ -30,7 +30,7 @@ ty_python_semantic = { path = "../crates/ty_python_semantic" }
ty_vendored = { path = "../crates/ty_vendored" } ty_vendored = { path = "../crates/ty_vendored" }
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 = "664750a6e588ed23a0d2d9105a02cb5993c8e178", default-features = false, features = [ salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "05a9af7f554b64b8aadc2eeb6f2caf73d0408d09", default-features = false, features = [
"compact_str", "compact_str",
"macros", "macros",
"salsa_unstable", "salsa_unstable",