language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-12-23 09:19:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove some clones

Browse source
This commit is contained in:
Eric Mark Martin 2025-12-20 14:14:11 -05:00
parent 34390c8b9c
commit 25428c22af
1 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/ty_python_semantic/src/types/narrow.rs
View file

@ -67,11 +67,8 @@ pub(crate) fn infer_narrowing_constraint<'db>(
PredicateNode::ReturnsNever(_) => return None,
PredicateNode::StarImportPlaceholder(_) => return None,
};
if let Some(constraints) = constraints {
constraints.get(&place).cloned()
} else {
None
}
constraints.and_then(|constraints| constraints.get(&place).cloned())
}
#[salsa::tracked(returns(as_ref), heap_size=ruff_memory_usage::heap_size)]
@ -428,18 +425,18 @@ type NarrowingConstraints<'db> = FxHashMap<ScopedPlaceId, NarrowingConstraint<'d
/// - Intersect the constraints normally otherwise
fn merge_constraints_and<'db>(
into: &mut NarrowingConstraints<'db>,
from: &NarrowingConstraints<'db>,
from: NarrowingConstraints<'db>,
db: &'db dyn Db,
) {
for (key, from_constraint) in from {
match into.entry(*key) {
match into.entry(key) {
Entry::Occupied(mut entry) => {
let into_constraint = entry.get();
entry.insert(into_constraint.merge_constraint_and(from_constraint, db));
entry.insert(into_constraint.merge_constraint_and(&from_constraint, db));
}
Entry::Vacant(entry) => {
entry.insert(from_constraint.clone());
entry.insert(from_constraint);
}
}
}
@ -457,20 +454,18 @@ fn merge_constraints_and<'db>(
/// via `UnionBuilder` to enable simplifications like `~AlwaysFalsy | ~AlwaysTruthy -> object`.
fn merge_constraints_or<'db>(
into: &mut NarrowingConstraints<'db>,
from: &NarrowingConstraints<'db>,
from: NarrowingConstraints<'db>,
db: &'db dyn Db,
) {
// For places that appear in `into` but not in `from`, widen to object
into.retain(|key, _| from.contains_key(key));
for (key, from_constraint) in from {
match into.entry(*key) {
match into.entry(key) {
Entry::Occupied(mut entry) => {
let into_constraint = entry.get_mut();
// Concatenate disjuncts
into_constraint
.disjuncts
.extend(from_constraint.disjuncts.clone());
into_constraint.disjuncts.extend(from_constraint.disjuncts);
// If none of the disjuncts have TypeGuard, we can simplify the constraint types
// via UnionBuilder. This enables simplifications like:
@ -486,9 +481,8 @@ fn merge_constraints_or<'db>(
db,
into_constraint.disjuncts.iter().map(|conj| conj.constraint),
);
// If simplified to object, we can drop the constraint entirely
if simplified.is_object() {
// Remove this entry since it provides no constraint
// If simplified to object, we can drop the constraint entirely
entry.remove();
} else {
// Replace with simplified constraint
@ -1370,7 +1364,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
self.evaluate_pattern_predicate_kind(predicate, subject, is_positive)
})
.reduce(|mut constraints, constraints_| {
merge_constraints(&mut constraints, &constraints_, db);
merge_constraints(&mut constraints, constraints_, db);
constraints
})
}
@ -1402,7 +1396,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
let mut aggregation: Option<NarrowingConstraints> = None;
for sub_constraint in sub_constraints.into_iter().flatten() {
if let Some(ref mut some_aggregation) = aggregation {
merge_constraints_and(some_aggregation, &sub_constraint, self.db);
merge_constraints_and(some_aggregation, sub_constraint, self.db);
} else {
aggregation = Some(sub_constraint);
}
@ -1418,7 +1412,7 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
if let Some(ref mut first) = first {
for rest_constraint in rest {
if let Some(rest_constraint) = rest_constraint {
merge_constraints_or(first, &rest_constraint, self.db);
merge_constraints_or(first, rest_constraint, self.db);
} else {
return None;
}