From e03e05d2b35259f759577fee9f3b7b554121df7d Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Tue, 27 May 2025 19:08:59 +0100 Subject: [PATCH] [ty] Simplify `Type::normalized` slightly (#18339) --- crates/ty_python_semantic/src/types.rs | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/crates/ty_python_semantic/src/types.rs b/crates/ty_python_semantic/src/types.rs index d88f98481f..ec2aa92f9a 100644 --- a/crates/ty_python_semantic/src/types.rs +++ b/crates/ty_python_semantic/src/types.rs @@ -1026,34 +1026,10 @@ impl<'db> Type<'db> { Type::BoundSuper(bound_super) => Type::BoundSuper(bound_super.normalized(db)), Type::GenericAlias(generic) => Type::GenericAlias(generic.normalized(db)), Type::SubclassOf(subclass_of) => Type::SubclassOf(subclass_of.normalized(db)), + Type::TypeVar(typevar) => Type::TypeVar(typevar.normalized(db)), Type::KnownInstance(known_instance) => { Type::KnownInstance(known_instance.normalized(db)) } - Type::TypeVar(typevar) => match typevar.bound_or_constraints(db) { - Some(TypeVarBoundOrConstraints::UpperBound(bound)) => { - Type::TypeVar(TypeVarInstance::new( - db, - typevar.name(db).clone(), - typevar.definition(db), - Some(TypeVarBoundOrConstraints::UpperBound(bound.normalized(db))), - typevar.variance(db), - typevar.default_ty(db), - typevar.kind(db), - )) - } - Some(TypeVarBoundOrConstraints::Constraints(union)) => { - Type::TypeVar(TypeVarInstance::new( - db, - typevar.name(db).clone(), - typevar.definition(db), - Some(TypeVarBoundOrConstraints::Constraints(union.normalized(db))), - typevar.variance(db), - typevar.default_ty(db), - typevar.kind(db), - )) - } - None => self, - }, Type::LiteralString | Type::AlwaysFalsy | Type::AlwaysTruthy