aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Partin <tristan@partin.io>2023-07-12 18:11:09 -0500
committerTristan Partin <tristan@partin.io>2023-07-12 18:56:06 -0500
commitb0f1f374e72db18ddfe94b1a56b64cec7e1c98c6 (patch)
treebaadeaa04bc8015dc30e505944979e6e4a04c5e7
parentd732e27e461b0fd7939dfb34e41d9008dd8c1d82 (diff)
downloadmeson-b0f1f374e72db18ddfe94b1a56b64cec7e1c98c6.zip
meson-b0f1f374e72db18ddfe94b1a56b64cec7e1c98c6.tar.gz
meson-b0f1f374e72db18ddfe94b1a56b64cec7e1c98c6.tar.bz2
Add type annotations where they previously didn't exist
-rw-r--r--mesonbuild/coredata.py4
-rw-r--r--mesonbuild/environment.py10
2 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index 6fff663..83a5213 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -139,7 +139,7 @@ class UserStringOption(UserOption[str]):
return value
class UserBooleanOption(UserOption[bool]):
- def __init__(self, description: str, value, yielding: bool = DEFAULT_YIELDING,
+ def __init__(self, description: str, value: bool, yielding: bool = DEFAULT_YIELDING,
deprecated: T.Union[bool, str, T.Dict[str, str], T.List[str]] = False):
super().__init__(description, [True, False], yielding, deprecated)
self.set_value(value)
@@ -571,7 +571,7 @@ class CoreData:
if self.cross_files:
BUILTIN_OPTIONS[OptionKey('libdir')].default = 'lib'
- def sanitize_prefix(self, prefix):
+ def sanitize_prefix(self, prefix: str) -> str:
prefix = os.path.expanduser(prefix)
if not os.path.isabs(prefix):
raise MesonException(f'prefix value {prefix!r} must be an absolute path')
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 4e943ba..ce7c9f1 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -82,7 +82,7 @@ def _get_env_var(for_machine: MachineChoice, is_cross: bool, var_name: str) -> T
return value
-def detect_gcovr(min_version='3.3', log=False):
+def detect_gcovr(min_version: str = '3.3', log: bool = False):
gcovr_exe = 'gcovr'
try:
p, found = Popen_safe([gcovr_exe, '--version'])[0:2]
@@ -271,7 +271,7 @@ def detect_windows_arch(compilers: CompilersDict) -> str:
return 'x86'
return os_arch
-def any_compiler_has_define(compilers: CompilersDict, define):
+def any_compiler_has_define(compilers: CompilersDict, define: str) -> bool:
for c in compilers.values():
try:
if c.has_builtin_define(define):
@@ -814,7 +814,7 @@ class Environment:
return is_object(fname)
@lru_cache(maxsize=None)
- def is_library(self, fname):
+ def is_library(self, fname: mesonlib.FileOrString):
return is_library(fname)
def lookup_binary_entry(self, for_machine: MachineChoice, name: str) -> T.Optional[T.List[str]]:
@@ -874,7 +874,7 @@ class Environment:
def get_datadir(self) -> str:
return self.coredata.get_option(OptionKey('datadir'))
- def get_compiler_system_lib_dirs(self, for_machine: MachineChoice):
+ def get_compiler_system_lib_dirs(self, for_machine: MachineChoice) -> T.List[str]:
for comp in self.coredata.compilers[for_machine].values():
if comp.id == 'clang':
index = 1
@@ -893,7 +893,7 @@ class Environment:
out = out.split('\n')[index].lstrip('libraries: =').split(':')
return [os.path.normpath(p) for p in out]
- def get_compiler_system_include_dirs(self, for_machine: MachineChoice):
+ def get_compiler_system_include_dirs(self, for_machine: MachineChoice) -> T.List[str]:
for comp in self.coredata.compilers[for_machine].values():
if comp.id == 'clang':
break