diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-09-07 12:12:41 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-10-03 00:14:43 -0400 |
| commit | 20d76b835372c0caf9cc3aac14b4984cac42f67a (patch) | |
| tree | 8eb661c20d791fc6b834a83aefb8f1672a3ecd78 /mesonbuild/modules | |
| parent | 676e66f8530ac45441c160eb8fe1d84a0703ceb6 (diff) | |
| download | meson-20d76b835372c0caf9cc3aac14b4984cac42f67a.zip meson-20d76b835372c0caf9cc3aac14b4984cac42f67a.tar.gz meson-20d76b835372c0caf9cc3aac14b4984cac42f67a.tar.bz2 | |
pylint: enable unnecessary-comprehension
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 3 | ||||
| -rw-r--r-- | mesonbuild/modules/rust.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 474226c..d475618 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -271,8 +271,7 @@ class DependenciesHelper: # Note that pkg-config is picky about whitespace. # 'foo > 1.2' is ok but 'foo>1.2' is not. # foo, bar' is ok, but 'foo,bar' is not. - new_vreqs = [s for s in mesonlib.stringlistify(version_reqs)] - self.version_reqs[name].update(new_vreqs) + self.version_reqs[name].update(version_reqs) def split_version_req(self, s: str) -> T.Tuple[str, T.Optional[str]]: for op in ['>=', '<=', '!=', '==', '=', '>', '<']: diff --git a/mesonbuild/modules/rust.py b/mesonbuild/modules/rust.py index bdbc3d0..9d7627e 100644 --- a/mesonbuild/modules/rust.py +++ b/mesonbuild/modules/rust.py @@ -134,8 +134,6 @@ class RustModule(ExtensionModule): del extra_args[i] break - dependencies = [d for d in kwargs['dependencies']] - # We need to cast here, as currently these don't have protocol in them, but test itself does. tkwargs = T.cast('_kwargs.FuncTest', kwargs.copy()) @@ -147,7 +145,7 @@ class RustModule(ExtensionModule): # one new_target_kwargs['rust_args'] = new_target_kwargs.get('rust_args', []) + ['--test'] new_target_kwargs['install'] = False - new_target_kwargs['dependencies'] = new_target_kwargs.get('dependencies', []) + dependencies + new_target_kwargs['dependencies'] = new_target_kwargs.get('dependencies', []) + kwargs['dependencies'] new_target = Executable( name, base_target.subdir, state.subproject, base_target.for_machine, |