[ty] Update salsa (#21281)

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

View file

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