From d41e46be146aaa4df7bc4fa30229fa149f151cba Mon Sep 17 00:00:00 2001 From: Jeong YunWon Date: Mon, 20 Mar 2023 19:18:49 +0900 Subject: [PATCH] remove is_typevar duplciation --- vm/src/builtins/union.rs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/vm/src/builtins/union.rs b/vm/src/builtins/union.rs index 30c95126e2..347836e10c 100644 --- a/vm/src/builtins/union.rs +++ b/vm/src/builtins/union.rs @@ -139,19 +139,10 @@ pub fn is_unionable(obj: PyObjectRef, vm: &VirtualMachine) -> bool { || obj.class().is(vm.ctx.types.union_type) } -fn is_typevar(obj: &PyObjectRef, vm: &VirtualMachine) -> bool { - let class = obj.class(); - "TypeVar" == &*class.slot_name() - && class - .get_attr(identifier!(vm, __module__)) - .and_then(|o| o.downcast_ref::().map(|s| s.as_str() == "typing")) - .unwrap_or(false) -} - fn make_parameters(args: &PyTupleRef, vm: &VirtualMachine) -> PyTupleRef { let mut parameters: Vec = Vec::with_capacity(args.len()); for arg in args { - if is_typevar(arg, vm) { + if genericalias::is_typevar(arg, vm) { if !parameters.iter().any(|param| param.is(arg)) { parameters.push(arg.clone()); }