aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2021-06-08 12:48:33 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-06-09 13:25:36 +0200
commit7fc755b334dd58471dfbf15062aa2ba07a82c8e7 (patch)
tree605d632e38e96d1c1cc5cabe3c896ee7ca84517a /mesonbuild
parent9c40b33cf6a0425a8452fa34dc7b4101e29d0319 (diff)
downloadmeson-7fc755b334dd58471dfbf15062aa2ba07a82c8e7.zip
meson-7fc755b334dd58471dfbf15062aa2ba07a82c8e7.tar.gz
meson-7fc755b334dd58471dfbf15062aa2ba07a82c8e7.tar.bz2
typing: Fully annotate run_project_tests.py
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/environment.py4
-rw-r--r--mesonbuild/mesonmain.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index ce037dd..03cd16e 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -1654,10 +1654,10 @@ class Environment:
def get_scratch_dir(self) -> str:
return self.scratch_dir
- def detect_objc_compiler(self, for_machine: MachineInfo) -> 'Compiler':
+ def detect_objc_compiler(self, for_machine: MachineChoice) -> 'Compiler':
return self._detect_objc_or_objcpp_compiler(for_machine, True)
- def detect_objcpp_compiler(self, for_machine: MachineInfo) -> 'Compiler':
+ def detect_objcpp_compiler(self, for_machine: MachineChoice) -> 'Compiler':
return self._detect_objc_or_objcpp_compiler(for_machine, False)
def _detect_objc_or_objcpp_compiler(self, for_machine: MachineChoice, objc: bool) -> 'Compiler':
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 809ccdf..4dd47e4 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -40,7 +40,7 @@ SET
# If on Windows and VS is installed but not set up in the environment,
# set it to be runnable. In this way Meson can be directly invoked
# from any shell, VS Code etc.
-def setup_vsenv():
+def setup_vsenv() -> None:
import subprocess, json, pathlib
if not mesonlib.is_windows():
return