mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 05:44:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[ty] Prevent union builder construction for just one declaration (#18954)

Browse source 
## Summary

Avoid the construction of the `DeclaredTypeBuilder` if there is just one
declared type.
This commit is contained in:
David Peter 2025-06-26 13:00:09 +02:00 • committed by GitHub
parent b01003f81d
commit c0beb3412f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/ty_python_semantic/src/place.rs
View file

@ -1120,7 +1120,7 @@ fn place_from_declarations_impl<'db>(
let mut all_declarations_definitely_reachable = true; let mut all_declarations_definitely_reachable = true;
let types = declarations.filter_map( let mut types = declarations.filter_map(
|DeclarationWithConstraint { |DeclarationWithConstraint {
declaration, declaration,
reachability_constraint, reachability_constraint,
@ -1147,18 +1147,24 @@ fn place_from_declarations_impl<'db>(
}, },
); );
let mut types = types.peekable(); if let Some(first) = types.next() {
let declared = if let Some(second) = types.next() {
let mut builder = DeclaredTypeBuilder::new(db);
builder.add(first);
builder.add(second);
for element in types {
builder.add(element);
}
let (union, conflicting) = builder.build();
if types.peek().is_some() { if !conflicting.is_empty() {
let mut builder = DeclaredTypeBuilder::new(db); return Err((union, conflicting));
for element in types { }
builder.add(element);
}
let (declared, conflicting) = builder.build();
if !conflicting.is_empty() { union
return Err((declared, conflicting)); } else {
} first
};
let boundness = match boundness_analysis { let boundness = match boundness_analysis {
BoundnessAnalysis::AssumeBound => { BoundnessAnalysis::AssumeBound => {