diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2023-09-26 10:42:38 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2023-09-27 11:55:29 -0700 |
| commit | 07597088a567ae91397810ed3c1aec063f38fcfd (patch) | |
| tree | d9c352c3db3885c2d6f2e360513648c521b5e8e1 | |
| parent | e27dbb42a0f174634c63cc6fa96445dea112e6bb (diff) | |
| download | meson-07597088a567ae91397810ed3c1aec063f38fcfd.tar.gz | |
interpreter: used typed_kwargs for rust_dependency_map
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 3e6d3b8e8..c06b5a1ea 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -3248,7 +3248,6 @@ class Interpreter(InterpreterBase, HoldableObject): kwargs: T.Union[kwtypes.Executable, kwtypes.StaticLibrary, kwtypes.SharedLibrary, kwtypes.SharedModule, kwtypes.Jar], targetclass: T.Type[T.Union[build.Executable, build.StaticLibrary, build.SharedModule, build.SharedLibrary, build.Jar]] ) -> T.Union[build.Executable, build.StaticLibrary, build.SharedModule, build.SharedLibrary, build.Jar]: - @FeatureNewKwargs('build target', '1.2.0', ['rust_dependency_map']) @FeatureNewKwargs('build target', '0.42.0', ['rust_crate_type', 'build_rpath', 'implicit_include_directories']) @FeatureNewKwargs('build target', '0.41.0', ['rust_args']) @FeatureNewKwargs('build target', '0.38.0', ['build_by_default']) diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index dd2e147f0..a80d489ec 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -331,6 +331,8 @@ class _BuildTarget(_BaseBuildTarget): """Arguments shared by non-JAR functions""" + rust_dependency_map: T.Dict[str, str] + class _LibraryMixin(TypedDict): diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 9a1904d57..dfc3ae2e9 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -522,6 +522,12 @@ _ALL_TARGET_KWS: T.List[KwargInfo] = [ _BUILD_TARGET_KWS: T.List[KwargInfo] = [ *_ALL_TARGET_KWS, RUST_CRATE_TYPE_KW, + KwargInfo( + 'rust_dependency_map', + ContainerTypeInfo(dict, str), + default={}, + since='1.2.0', + ), ] def _validate_win_subsystem(value: T.Optional[str]) -> T.Optional[str]: |