Fixed issues raised in review.

1 files changed, 29 insertions, 31 deletions

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 91d1653..f7df18a 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1252,20 +1252,18 @@ buildtarget_kwargs = set(['build_by_default',
                           'vs_module_defs',
                       ])
 
-build_target_common_kwargs = set()
-build_target_common_kwargs.update(buildtarget_kwargs)
-build_target_common_kwargs.update(lang_arg_kwargs)
-build_target_common_kwargs.update(pch_kwargs)
-build_target_common_kwargs.update(vala_kwargs)
-build_target_common_kwargs.update(rust_kwargs)
-build_target_common_kwargs.update(cs_kwargs)
+build_target_common_kwargs = (
+    buildtarget_kwargs |
+    lang_arg_kwargs |
+    pch_kwargs |
+    vala_kwargs |
+    rust_kwargs |
+    cs_kwargs)
 
 exe_kwargs = set()
 exe_kwargs.update(build_target_common_kwargs)
 
-shlib_kwargs = set()
-shlib_kwargs.update(build_target_common_kwargs)
-shlib_kwargs.update(['version', 'soversion'])
+shlib_kwargs = (build_target_common_kwargs) | {'version', 'soversion'}
 shmod_kwargs = shlib_kwargs
 stlib_kwargs = shlib_kwargs
 
@@ -1275,33 +1273,33 @@ jar_kwargs.update(['main_class'])
 build_target_kwargs = exe_kwargs.copy()
 build_target_kwargs.update(['target_type'])
 
-permitted_kwargs = {'add_global_arguments': set(['language']),
-                    'add_languages': set(['required']),
-                    'add_project_arguments': set(['language']),
-                    'add_test_setup': set(['exe_wrapper', 'gdb', 'timeout_multiplier', 'env']),
-                    'benchmark': set(['args', 'env', 'should_fail', 'timeout', 'workdir', 'suite']),
+permitted_kwargs = {'add_global_arguments': {'language'},
+                    'add_languages': {'required'},
+                    'add_project_arguments': {'language'},
+                    'add_test_setup': {'exe_wrapper', 'gdb', 'timeout_multiplier', 'env'},
+                    'benchmark': {'args', 'env', 'should_fail', 'timeout', 'workdir', 'suite'},
                     'build_target': build_target_kwargs,
-                    'configure_file': set(['input', 'output', 'configuration', 'command', 'install_dir', 'capture', 'install']),
-                    'custom_target': set(['input', 'output', 'command', 'install', 'install_dir', 'build_always', 'capture', 'depends', 'depend_files', 'depfile', 'build_by_default']),
-                    'declare_dependency': set(['include_directories', 'link_with', 'sources', 'dependencies', 'compile_args', 'link_args', 'version']),
+                    'configure_file': {'input', 'output', 'configuration', 'command', 'install_dir', 'capture', 'install'},
+                    'custom_target': {'input', 'output', 'command', 'install', 'install_dir', 'build_always', 'capture', 'depends', 'depend_files', 'depfile', 'build_by_default'},
+                    'declare_dependency': {'include_directories', 'link_with', 'sources', 'dependencies', 'compile_args', 'link_args', 'version'},
                     'executable': exe_kwargs,
-                    'find_program': set(['required',]),
-                    'generator': set(['arguments', 'output', 'depfile']),
-                    'include_directories': set(['is_system']),
-                    'install_data': set(['install_dir', 'install_mode', 'sources']),
-                    'install_headers': set(['install_dir', 'subdir']),
-                    'install_man': set(['install_dir']),
-                    'install_subdir': set(['install_dir', 'install_mode']),
+                    'find_program': {'required'},
+                    'generator': {'arguments', 'output', 'depfile'},
+                    'include_directories': {'is_system'},
+                    'install_data': {'install_dir', 'install_mode', 'sources'},
+                    'install_headers': {'install_dir', 'subdir'},
+                    'install_man': {'install_dir'},
+                    'install_subdir': {'install_dir', 'install_mode'},
                     'jar': jar_kwargs,
-                    'project': set(['version', 'meson_version', 'default_options', 'license', 'subproject_dir']),
-                    'run_target': set(['command', 'depends']),
+                    'project': {'version', 'meson_version', 'default_options', 'license', 'subproject_dir'},
+                    'run_target': {'command', 'depends'},
                     'shared_library': shlib_kwargs,
                     'shared_module': shmod_kwargs,
                     'static_library': stlib_kwargs,
-                    'subproject': set(['version', 'default_options']),
-                    'test': set(['args', 'env', 'is_parallel', 'should_fail', 'timeout', 'workdir', 'suite']),
-                    'vcs_tag': set(['input', 'output', 'fallback', 'command', 'replace_string']),
-}
+                    'subproject': {'version', 'default_options'},
+                    'test': {'args', 'env', 'is_parallel', 'should_fail', 'timeout', 'workdir', 'suite'},
+                    'vcs_tag': {'input', 'output', 'fallback', 'command', 'replace_string'},
+                    }
 
 
 class Interpreter(InterpreterBase):