diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-11-28 17:49:04 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-12-15 13:26:55 -0800 |
| commit | 5cd09bcabcf4845274cf19b9d796517bd4f8fc72 (patch) | |
| tree | 5623d1433dac79f687769c6352c9e3efc6ae80cd /mesonbuild/cargo | |
| parent | 21e09772880abc8bd79ad9b8c61dd151a4a0c7ff (diff) | |
| download | meson-5cd09bcabcf4845274cf19b9d796517bd4f8fc72.tar.gz | |
cargo: add --check-cfg cfg(test) unconditionally
It should be added even if unexpected_cfgs is not part of Cargo.toml.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/cargo')
| -rw-r--r-- | mesonbuild/cargo/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/cargo/manifest.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/cargo/interpreter.py b/mesonbuild/cargo/interpreter.py index e26298641..ccde33d5e 100644 --- a/mesonbuild/cargo/interpreter.py +++ b/mesonbuild/cargo/interpreter.py @@ -144,6 +144,8 @@ class PackageState: args.extend(lint.to_arguments(has_check_cfg)) if has_check_cfg: + args.append('--check-cfg') + args.append('cfg(test)') for feature in self.manifest.features: if feature != 'default': args.append('--check-cfg') diff --git a/mesonbuild/cargo/manifest.py b/mesonbuild/cargo/manifest.py index ec84e4b16..2c3eeb3e0 100644 --- a/mesonbuild/cargo/manifest.py +++ b/mesonbuild/cargo/manifest.py @@ -442,8 +442,7 @@ class Lint: settings = T.cast('raw.Lint', {'level': settings}) check_cfg = None if name == 'unexpected_cfgs': - # 'cfg(test)' is added automatically by cargo - check_cfg = ['cfg(test)'] + settings.get('check-cfg', []) + check_cfg = settings.get('check-cfg', []) lints[name] = Lint(name=name, level=settings['level'], priority=settings.get('priority', 0), |