From d2046540890007cd921c60484a274d6aef17bdda Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 22 Mar 2021 11:28:01 -0700 Subject: [PATCH] dependencies/base: Use Compiler instead of CompilerType Since Compiler is actually useful now as a base class, unlike when this code was written. --- mesonbuild/dependencies/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 27c33b625..0045805dd 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -39,7 +39,7 @@ from ..mesondata import mesondata from ..programs import ExternalProgram, find_external_program if T.TYPE_CHECKING: - from ..compilers.compilers import CompilerType # noqa: F401 + from ..compilers.compilers import Compiler DependencyType = T.TypeVar('DependencyType', bound='Dependency') # These must be defined in this file to avoid cyclical references. @@ -2313,7 +2313,7 @@ def factory_methods(methods: T.Set[DependencyMethods]) -> T.Callable[['FactoryTy def detect_compiler(name: str, env: Environment, for_machine: MachineChoice, - language: T.Optional[str]) -> T.Optional['CompilerType']: + language: T.Optional[str]) -> T.Optional['Compiler']: """Given a language and environment find the compiler used.""" compilers = env.coredata.compilers[for_machine]