Skip to content

Commit 350f3d6

Browse files
committed
Auto merge of #4845 - flip1995:clippy_toml_deps, r=phansch
Don't error on clippy.toml of dependencies Fixes #3874 Checking for `metadata` wasn't enough anymore. `--cap-lints allow` only appears when compiling deps though. changelog: none
2 parents 4780ac0 + a61fd43 commit 350f3d6

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/driver.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,9 @@ pub fn main() {
318318
};
319319

320320
// this check ensures that dependencies are built but not linted and the final
321-
// crate is
322-
// linted but not built
321+
// crate is linted but not built
323322
let clippy_enabled = env::var("CLIPPY_TESTS").map_or(false, |val| val == "true")
324-
|| arg_value(&orig_args, "--emit", |val| val.split(',').any(|e| e == "metadata")).is_some();
323+
|| arg_value(&orig_args, "--cap-lints", |val| val == "allow").is_none();
325324

326325
if clippy_enabled {
327326
args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]);

0 commit comments

Comments
 (0)