diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2022-03-22 21:51:38 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-05-31 17:49:29 -0400 |
commit | 52d01dbf38e484a14c03e747ca4d471e4fe009ac (patch) | |
tree | c8a5d41c0aa29300901ec1fbf25e1703a80543d6 /mesonbuild/interpreter | |
parent | e3d70d89b1ff17a34dd7e8d3de18647b26d171f0 (diff) | |
download | meson-52d01dbf38e484a14c03e747ca4d471e4fe009ac.zip meson-52d01dbf38e484a14c03e747ca4d471e4fe009ac.tar.gz meson-52d01dbf38e484a14c03e747ca4d471e4fe009ac.tar.bz2 |
rename a badly named KwargInfo
CT_OUTPUT_KW is the same OUTPUT_KW we use in lots of places. The most
distinctive thing about it is not that it's part of custom_target
(basically any other function that uses such a kwarg follows the same
rules due to using CustomTarget under the hood), but the fact that it
takes multiple outputs.
Diffstat (limited to 'mesonbuild/interpreter')
-rw-r--r-- | mesonbuild/interpreter/interpreter.py | 6 | ||||
-rw-r--r-- | mesonbuild/interpreter/type_checking.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 8411285..05614aa 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -57,7 +57,7 @@ from .type_checking import ( CT_BUILD_BY_DEFAULT, CT_INPUT_KW, CT_INSTALL_DIR_KW, - CT_OUTPUT_KW, + MULTI_OUTPUT_KW, OUTPUT_KW, DEFAULT_OPTIONS, DEPENDS_KW, @@ -1761,7 +1761,7 @@ class Interpreter(InterpreterBase, HoldableObject): @typed_kwargs( 'vcs_tag', CT_INPUT_KW.evolve(required=True), - CT_OUTPUT_KW, + MULTI_OUTPUT_KW, # Cannot use the COMMAND_KW because command is allowed to be empty KwargInfo( 'command', @@ -1851,7 +1851,7 @@ class Interpreter(InterpreterBase, HoldableObject): CT_INPUT_KW, CT_INSTALL_DIR_KW, CT_INSTALL_TAG_KW, - CT_OUTPUT_KW, + MULTI_OUTPUT_KW, DEPENDS_KW, DEPEND_FILES_KW, DEPFILE_KW, diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index e83624c..5075f85 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -268,7 +268,7 @@ def _output_validator(outputs: T.List[str]) -> T.Optional[str]: return None -CT_OUTPUT_KW: KwargInfo[T.List[str]] = KwargInfo( +MULTI_OUTPUT_KW: KwargInfo[T.List[str]] = KwargInfo( 'output', ContainerTypeInfo(list, str, allow_empty=False), listify=True, |