diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 0db5c79af705..a45de70ddd63 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -287,7 +287,7 @@ def __init__(self, build: T.Optional[build.Build], interpreter: T.Optional['Inte # 'vslite_ctx' is only provided when # we expect this backend setup/generation to make use of previously captured # compile args (as is the case when using '--genvslite'). - def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional[dict]: + def generate(self, capture: bool = False, vslite_ctx: T.Optional[T.Dict] = None) -> T.Optional[T.Dict]: raise RuntimeError(f'generate is not implemented in {type(self).__name__}') def get_target_filename(self, t: T.Union[build.Target, build.CustomTargetIndex], *, warn_multi_output: bool = True) -> str: diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 32a36a9ba6a5..228312d550bb 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -581,7 +581,7 @@ def detect_prefix(out): raise MesonException(f'Could not determine vs dep dependency prefix string. output: {stderr} {stdout}') - def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional[dict]: + def generate(self, capture: bool = False, vslite_ctx: T.Optional[T.Dict] = None) -> T.Optional[T.Dict]: if vslite_ctx: # We don't yet have a use case where we'd expect to make use of this, # so no harm in catching and reporting something unexpected. diff --git a/mesonbuild/backend/nonebackend.py b/mesonbuild/backend/nonebackend.py index fa3f553f415f..ab11e8d4034d 100644 --- a/mesonbuild/backend/nonebackend.py +++ b/mesonbuild/backend/nonebackend.py @@ -2,6 +2,7 @@ # Copyright 2022 The Meson development team from __future__ import annotations +import typing as T from .backends import Backend from .. import mlog @@ -12,7 +13,7 @@ class NoneBackend(Backend): name = 'none' - def generate(self, capture: bool = False, vslite_ctx: dict = None) -> None: + def generate(self, capture: bool = False, vslite_ctx: T.Optional[T.Dict] = None) -> None: # Check for (currently) unexpected capture arg use cases - if capture: raise MesonBugException('We do not expect the none backend to generate with \'capture = True\'') diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 20ad266f0f52..9c23571bd7d8 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -221,7 +221,7 @@ def generate_custom_generator_commands(self, target, parent_node): def generate(self, capture: bool = False, - vslite_ctx: dict = None) -> T.Optional[dict]: + vslite_ctx: T.Optional[T.Dict] = None) -> T.Optional[T.Dict]: # Check for (currently) unexpected capture arg use cases - if capture: raise MesonBugException('We do not expect any vs backend to generate with \'capture = True\'') diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 467cd1a6dc0b..c801b5aae260 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -255,7 +255,7 @@ def determine_swift_dep_dirs(self, target: build.BuildTarget) -> T.List[str]: result.append(os.path.join(self.environment.get_build_dir(), self.get_target_dir(l))) return result - def generate(self, capture: bool = False, vslite_ctx: dict = None) -> None: + def generate(self, capture: bool = False, vslite_ctx: T.Optional[T.Dict] = None) -> None: # Check for (currently) unexpected capture arg use cases - if capture: raise MesonBugException('We do not expect the xcode backend to generate with \'capture = True\'')