aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/coredata.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-07-26 14:25:14 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-08-16 16:21:51 -0700
commite9639be16790f94d759ea8467541e3a471565622 (patch)
tree65834ceb1bb7af8799e75a1ceb6c7fe3312bf26e /mesonbuild/coredata.py
parent32d3b5c9e2d17b6cfc2a3fa4e3f5225d927abe03 (diff)
downloadmeson-e9639be16790f94d759ea8467541e3a471565622.zip
meson-e9639be16790f94d759ea8467541e3a471565622.tar.gz
meson-e9639be16790f94d759ea8467541e3a471565622.tar.bz2
compilers: Fix annotations for run and cached_compile
Which absolutely should accept `str | File`, but the annotations claim that only strings are accepted.
Diffstat (limited to 'mesonbuild/coredata.py')
-rw-r--r--mesonbuild/coredata.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index ea74e7c..3436515 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -34,14 +34,14 @@ import typing as T
if T.TYPE_CHECKING:
from . import dependencies
- from .compilers.compilers import Compiler, CompileResult # noqa: F401
+ from .compilers.compilers import Compiler
from .environment import Environment
- from .mesonlib import OptionOverrideProxy
+ from .mesonlib import OptionOverrideProxy, FileOrString
from .cmake.traceparser import CMakeCacheEntry
OptionDictType = T.Union[T.Dict[str, 'UserOption[T.Any]'], OptionOverrideProxy]
KeyedOptionDictType = T.Union[T.Dict['OptionKey', 'UserOption[T.Any]'], OptionOverrideProxy]
- CompilerCheckCacheKey = T.Tuple[T.Tuple[str, ...], str, str, T.Tuple[str, ...], str]
+ CompilerCheckCacheKey = T.Tuple[T.Tuple[str, ...], str, 'FileOrString', T.Tuple[str, ...], str]
version = '0.59.99'
backendlist = ['ninja', 'vs', 'vs2010', 'vs2012', 'vs2013', 'vs2015', 'vs2017', 'vs2019', 'xcode']