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

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
8 changes: 4 additions & 4 deletions mesonbuild/backend/vs2010backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def generate_guid_from_path(path, path_type) -> str:
def detect_microsoft_gdk(platform: str) -> bool:
return re.match(r'Gaming\.(Desktop|Xbox.XboxOne|Xbox.Scarlett)\.x64', platform, re.IGNORECASE) is not None

def filtered_src_langs_generator(sources: T.List[str]):
def filtered_src_langs_generator(sources: T.List[File]):
for src in sources:
ext = src.split('.')[-1]
if compilers.compilers.is_source_suffix(ext):
Expand All @@ -106,7 +106,7 @@ def filtered_src_langs_generator(sources: T.List[str]):
# simply refer to the project's shared intellisense define and include fields, rather than have to fill out their
# own duplicate full set of defines/includes/opts intellisense fields. All of which helps keep the vcxproj file
# size down.
def get_primary_source_lang(target_sources: T.List[File], custom_sources: T.List[str]) -> T.Optional[str]:
def get_primary_source_lang(target_sources: T.List[File], custom_sources: T.List[File]) -> T.Optional[str]:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my series I found this was correct as-is, this ultimately comes from generate_genlist_for_target, which does output a list[str]

lang_counts = Counter([compilers.compilers.SUFFIX_TO_LANG[src.suffix] for src in target_sources if compilers.compilers.is_source_suffix(src.suffix)])
lang_counts += Counter(filtered_src_langs_generator(custom_sources))
most_common_lang_list = lang_counts.most_common(1)
Expand Down Expand Up @@ -288,7 +288,7 @@ def generate(self,
Vs2010Backend.touch_regen_timestamp(self.environment.get_build_dir())

@staticmethod
def get_regen_stampfile(build_dir: str) -> None:
def get_regen_stampfile(build_dir: str) -> str:
return os.path.join(os.path.join(build_dir, Environment.private_dir), 'regen.stamp')

@staticmethod
Expand Down Expand Up @@ -395,7 +395,7 @@ def get_target_deps(self, t: T.Dict[T.Any, T.Union[build.Target, build.CustomTar
ret.update(all_deps)
return ret

def generate_solution_dirs(self, ofile: str, parents: T.Sequence[Path]) -> None:
def generate_solution_dirs(self, ofile: T.TextIO, parents: T.Sequence[Path]) -> None:
prj_templ = 'Project("{%s}") = "%s", "%s", "{%s}"\n'
iterpaths = reversed(parents)
# Skip first path
Expand Down