fix confusing incorrect default name for a KwargInfo

We can use this lots of places, and it's always the same kwarg. There
doesn't seem to be a point in naming it badly, then evolving it to the
standard name in the one place it is currently used. This made it not
shareable.
pull/10495/head
Eli Schwartz 3 years ago
parent c1aeb2f7e4
commit edb38fd6f6
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
  1. 2
      mesonbuild/interpreter/type_checking.py
  2. 2
      mesonbuild/modules/windows.py

@ -328,7 +328,7 @@ CT_BUILD_ALWAYS_STALE: KwargInfo[T.Optional[bool]] = KwargInfo(
INSTALL_DIR_KW: KwargInfo[T.Optional[str]] = KwargInfo('install_dir', (str, NoneType)) INSTALL_DIR_KW: KwargInfo[T.Optional[str]] = KwargInfo('install_dir', (str, NoneType))
INCLUDE_DIRECTORIES: KwargInfo[T.List[T.Union[str, IncludeDirs]]] = KwargInfo( INCLUDE_DIRECTORIES: KwargInfo[T.List[T.Union[str, IncludeDirs]]] = KwargInfo(
'include_dirs', 'include_directories',
ContainerTypeInfo(list, (str, IncludeDirs)), ContainerTypeInfo(list, (str, IncludeDirs)),
listify=True, listify=True,
default=[], default=[],

@ -111,7 +111,7 @@ class WindowsModule(ExtensionModule):
'winddows.compile_resoures', 'winddows.compile_resoures',
DEPEND_FILES_KW.evolve(since='0.47.0'), DEPEND_FILES_KW.evolve(since='0.47.0'),
DEPENDS_KW.evolve(since='0.47.0'), DEPENDS_KW.evolve(since='0.47.0'),
INCLUDE_DIRECTORIES.evolve(name='include_directories'), INCLUDE_DIRECTORIES,
KwargInfo('args', ContainerTypeInfo(list, str), default=[], listify=True), KwargInfo('args', ContainerTypeInfo(list, str), default=[], listify=True),
) )
def compile_resources(self, state: 'ModuleState', def compile_resources(self, state: 'ModuleState',

Loading…
Cancel
Save