diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2021-07-26 14:58:24 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2021-08-16 16:21:51 -0700 |
commit | 7dda90f1bfaae2b297550991c0b03f31912513dc (patch) | |
tree | 207682d2368a091818f082de0a72b8210913fa53 | |
parent | e3c72ad7c796fb69db998e87e1e2e4e7c834e081 (diff) | |
download | meson-7dda90f1bfaae2b297550991c0b03f31912513dc.zip meson-7dda90f1bfaae2b297550991c0b03f31912513dc.tar.gz meson-7dda90f1bfaae2b297550991c0b03f31912513dc.tar.bz2 |
interpreter/compiler: remove unittest_args method
It's not documented, and it's been marked deprecated for who knows how
long.
-rw-r--r-- | docs/markdown/snippets/remove_unittest_args_method.md | 4 | ||||
-rw-r--r-- | mesonbuild/interpreter/compiler.py | 19 |
2 files changed, 7 insertions, 16 deletions
diff --git a/docs/markdown/snippets/remove_unittest_args_method.md b/docs/markdown/snippets/remove_unittest_args_method.md new file mode 100644 index 0000000..4373332 --- /dev/null +++ b/docs/markdown/snippets/remove_unittest_args_method.md @@ -0,0 +1,4 @@ +## Compiler.unittest_args has been removed + +It's never been documented, and it's been marked deprecated for a long time, so +let's remove it. diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py index 139426c..5cc5a61 100644 --- a/mesonbuild/interpreter/compiler.py +++ b/mesonbuild/interpreter/compiler.py @@ -98,7 +98,6 @@ class CompilerHolder(ObjectHolder['Compiler']): 'has_multi_link_arguments': self.has_multi_link_arguments_method, 'get_supported_link_arguments': self.get_supported_link_arguments_method, 'first_supported_link_argument': self.first_supported_link_argument_method, - 'unittest_args': self.unittest_args_method, 'symbols_have_underscore_prefix': self.symbols_have_underscore_prefix_method, 'get_argument_syntax': self.get_argument_syntax_method, }) @@ -229,36 +228,24 @@ class CompilerHolder(ObjectHolder['Compiler']): @noPosargs @noKwargs - def get_id_method(self, args, kwargs): + def get_id_method(self, args: T.List['TYPE_var'], kwargs: 'TYPE_kwargs') -> str: return self.compiler.get_id() @noPosargs @noKwargs @FeatureNew('compiler.get_linker_id', '0.53.0') - def get_linker_id_method(self, args, kwargs): + def get_linker_id_method(self, args: T.List['TYPE_var'], kwargs: 'TYPE_kwargs') -> str: return self.compiler.get_linker_id() @noPosargs @noKwargs - def symbols_have_underscore_prefix_method(self, args, kwargs): + def symbols_have_underscore_prefix_method(self, args: T.List['TYPE_var'], kwargs: 'TYPE_kwargs') -> bool: ''' Check if the compiler prefixes _ (underscore) to global C symbols See: https://en.wikipedia.org/wiki/Name_mangling#C ''' return self.compiler.symbols_have_underscore_prefix(self.environment) - @noPosargs - @noKwargs - def unittest_args_method(self, args, kwargs): - ''' - This function is deprecated and should not be used. - It can be removed in a future version of Meson. - ''' - if not hasattr(self.compiler, 'get_feature_args'): - raise InterpreterException(f'This {self.compiler.get_display_language()} compiler has no feature arguments.') - build_to_src = os.path.relpath(self.environment.get_source_dir(), self.environment.get_build_dir()) - return self.compiler.get_feature_args({'unittest': 'true'}, build_to_src) - @permittedKwargs({ 'prefix', 'no_builtin_args', |