diff options
| author | bors <bors@rust-lang.org> | 2022-01-19 08:55:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-19 08:55:40 +0000 |
| commit | 0b143e347c61ab2fc62e9b533d48009aede2f3fc (patch) | |
| tree | ff449e0b4112ff2c99312e1a598711c34891e716 /src | |
| parent | 16032c53c9b023ba55c102bc4e94691303399487 (diff) | |
| parent | 3afbae33ab55f7206460ad34196c816aa2ac8909 (diff) | |
Auto merge of #8304 - camsteffen:test-tweaks, r=flip1995
Remove __CLIPPY_INTERNAL_TESTS env var changelog: none It doesn't have any effect AFAICT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/driver.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/driver.rs b/src/driver.rs index a8aa3a76abc..8f8f1140a3d 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -331,11 +331,10 @@ pub fn main() { // - IF Clippy is run on the main crate, not on deps (`!cap_lints_allow`) THEN // - IF `--no-deps` is not set (`!no_deps`) OR // - IF `--no-deps` is set and Clippy is run on the specified primary package - let clippy_tests_set = env::var("__CLIPPY_INTERNAL_TESTS").map_or(false, |val| val == "true"); let cap_lints_allow = arg_value(&orig_args, "--cap-lints", |val| val == "allow").is_some(); let in_primary_package = env::var("CARGO_PRIMARY_PACKAGE").is_ok(); - let clippy_enabled = clippy_tests_set || (!cap_lints_allow && (!no_deps || in_primary_package)); + let clippy_enabled = !cap_lints_allow && (!no_deps || in_primary_package); if clippy_enabled { args.extend(clippy_args); } |
