diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2024-08-20 10:39:44 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-08-26 12:23:03 -0400 |
| commit | 415ccb4b16e3432f51c8abe915fcca1494bfcc9b (patch) | |
| tree | 099bbccba4cd113d3c6773422500747ea6efe302 | |
| parent | 79c47bd9d4c080e9f13368c12233709eb4c75bbc (diff) | |
| download | meson-415ccb4b16e3432f51c8abe915fcca1494bfcc9b.tar.gz | |
cmake/interpreter: clear up some ambiguous Optional handling
It may have all been correct, but mypy and pyright couldn't be sure of
that.
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 7071fe4f8..db0fc4b36 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -135,10 +135,7 @@ class OutputTargetMap: self.build_dir = build_dir def add(self, tgt: T.Union['ConverterTarget', 'ConverterCustomTarget']) -> None: - def assign_keys(keys: T.List[str]) -> None: - for i in [x for x in keys if x]: - self.tgt_map[i] = tgt - keys = [self._target_key(tgt.cmake_name)] + keys: T.List[T.Optional[str]] = [self._target_key(tgt.cmake_name)] if isinstance(tgt, ConverterTarget): keys += [tgt.full_name] keys += [self._rel_artifact_key(x) for x in tgt.artifacts] @@ -146,7 +143,9 @@ class OutputTargetMap: if isinstance(tgt, ConverterCustomTarget): keys += [self._rel_generated_file_key(x) for x in tgt.original_outputs] keys += [self._base_generated_file_key(x) for x in tgt.original_outputs] - assign_keys(keys) + for k in keys: + if k is not None: + self.tgt_map[k] = tgt def _return_first_valid_key(self, keys: T.List[str]) -> T.Optional[T.Union['ConverterTarget', 'ConverterCustomTarget']]: for i in keys: |