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 <[email protected]>

Author: bonzini

mesonbuild/cargo/interpreter.py

@@ -144,6 +144,8 @@ def get_lint_args(self, rustc: RustCompiler) -> T.List[str]:
             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')

mesonbuild/cargo/manifest.py

@@ -442,8 +442,7 @@ def from_raw(cls, r: T.Union[raw.FromWorkspace, T.Dict[str, T.Dict[str, raw.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),

unittests/cargotests.py

@@ -428,7 +428,7 @@ def test_cargo_toml_lints(self) -> None:
         self.assertEqual(manifest.lints[2].name, 'unexpected_cfgs')
         self.assertEqual(manifest.lints[2].level, 'deny')
         self.assertEqual(manifest.lints[2].priority, 0)
-        self.assertEqual(manifest.lints[2].check_cfg, ['cfg(test)', 'cfg(MESON)'])
+        self.assertEqual(manifest.lints[2].check_cfg, ['cfg(MESON)'])
 
     def test_cargo_toml_lints_to_args(self) -> None:
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -444,8 +444,7 @@ def test_cargo_toml_lints_to_args(self) -> None:
         self.assertEqual(manifest.lints[1].to_arguments(True), ['-A', 'unknown_lints'])
         self.assertEqual(manifest.lints[2].to_arguments(False), ['-D', 'unexpected_cfgs'])
         self.assertEqual(manifest.lints[2].to_arguments(True),
-                         ['-D', 'unexpected_cfgs', '--check-cfg', 'cfg(test)',
-                          '--check-cfg', 'cfg(MESON)'])
+                         ['-D', 'unexpected_cfgs', '--check-cfg', 'cfg(MESON)'])
 
     def test_cargo_toml_dependencies(self) -> None:
         with tempfile.TemporaryDirectory() as tmpdir: