Skip to content

mypy: further work on filling in missing types #15057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

mypy: further work on filling in missing types #15057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0bdf78
vs backend: don't rely on implicit re.Match truthiness
eli-schwartz Sep 25, 2025
3f63a02
fix obviously wrong type annotations
eli-schwartz Sep 25, 2025
2dfe727
reduce exposed type interface from Path to PurePath
eli-schwartz Sep 26, 2025
3c1ca3e
fix another sinful usage of typing.Sequence[str]
eli-schwartz Sep 26, 2025
a05df2c
mypy: further work on filling in missing types
eli-schwartz Sep 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mesonbuild/backend/backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ def init_language_file(suffix: str, unity_file_number: int) -> T.TextIO:
return result

@staticmethod
def relpath(todir: str, fromdir: str) -> str:
def relpath(todir: T.Union[str, os.PathLike], fromdir: T.Union[str, os.PathLike]) -> str:
return os.path.relpath(os.path.join('dummyprefixdir', todir),
os.path.join('dummyprefixdir', fromdir))

Expand Down
102 changes: 54 additions & 48 deletions mesonbuild/backend/vs2010backend.py
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions mesonbuild/backend/vs2017backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from ..mesonlib import MesonException

if T.TYPE_CHECKING:
from ..arglist import CompilerArgs
from ..build import Build
from ..interpreter import Interpreter

Expand Down Expand Up @@ -46,11 +47,11 @@ def detect_toolset(self) -> None:
if sdk_version:
self.windows_target_platform_version = sdk_version.rstrip('\\')

def generate_debug_information(self, link):
def generate_debug_information(self, link: ET.Element) -> None:
# valid values for vs2017 is 'false', 'true', 'DebugFastLink', 'DebugFull'
ET.SubElement(link, 'GenerateDebugInformation').text = 'DebugFull'

def generate_lang_standard_info(self, file_args, clconf):
def generate_lang_standard_info(self, file_args: T.Dict[str, CompilerArgs], clconf: ET.Element) -> None:
if 'cpp' in file_args:
optargs = [x for x in file_args['cpp'] if x.startswith('/std:c++')]
if optargs:
Expand Down
5 changes: 3 additions & 2 deletions mesonbuild/backend/vs2019backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from .vs2010backend import Vs2010Backend

if T.TYPE_CHECKING:
from ..arglist import CompilerArgs
from ..build import Build
from ..interpreter import Interpreter

Expand Down Expand Up @@ -41,11 +42,11 @@ def detect_toolset(self) -> None:
if sdk_version:
self.windows_target_platform_version = sdk_version.rstrip('\\')

def generate_debug_information(self, link):
def generate_debug_information(self, link: ET.Element) -> None:
# valid values for vs2019 is 'false', 'true', 'DebugFastLink', 'DebugFull'
ET.SubElement(link, 'GenerateDebugInformation').text = 'DebugFull'

def generate_lang_standard_info(self, file_args, clconf):
def generate_lang_standard_info(self, file_args: T.Dict[str, CompilerArgs], clconf: ET.Element) -> None:
if 'cpp' in file_args:
optargs = [x for x in file_args['cpp'] if x.startswith('/std:c++')]
if optargs:
Expand Down
5 changes: 3 additions & 2 deletions mesonbuild/backend/vs2022backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from .vs2010backend import Vs2010Backend

if T.TYPE_CHECKING:
from ..arglist import CompilerArgs
from ..build import Build
from ..interpreter import Interpreter

Expand Down Expand Up @@ -41,11 +42,11 @@ def detect_toolset(self) -> None:
if sdk_version:
self.windows_target_platform_version = sdk_version.rstrip('\\')

def generate_debug_information(self, link):
def generate_debug_information(self, link: ET.Element) -> None:
# valid values for vs2022 is 'false', 'true', 'DebugFastLink', 'DebugFull'
ET.SubElement(link, 'GenerateDebugInformation').text = 'DebugFull'

def generate_lang_standard_info(self, file_args, clconf):
def generate_lang_standard_info(self, file_args: T.Dict[str, CompilerArgs], clconf: ET.Element) -> None:
if 'cpp' in file_args:
optargs = [x for x in file_args['cpp'] if x.startswith('/std:c++')]
if optargs:
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/coredata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def __init__(self, cmd_options: SharedCMDOptions, scratch_dir: str, meson_comman
self.regen_guid = str(uuid.uuid4()).upper()
self.install_guid = str(uuid.uuid4()).upper()
self.meson_command = meson_command
self.target_guids = {}
self.target_guids: T.Dict[str, str] = {}
self.version = version
self.cross_files = self.__load_config_files(cmd_options, scratch_dir, 'cross')
self.compilers: PerMachine[T.Dict[str, Compiler]] = PerMachine(OrderedDict(), OrderedDict())
Expand Down
Loading