Skip to content

Commit f11dae2

Browse files
committed
Auto merge of #54358 - flip1995:beta, r=Manishearth
[beta] Cancel warning for tool_lints For the discussion about this, see: rust-lang/rust-clippy#3159 `clippy-preview` is available on stable since 1.29. So when running `cargo +beta clippy` on a crate with `#![allow(clippy_lint)]` a warning is produced, which tells the programmer to change this to `#![allow(clippy::clippy_lint)]`. But since `tool_lints` aren't stable yet, this would require a `#![feature(tool_lints)]`. Features aren't available on stable or beta, so we cannot do this. Even wrapping `cfg_attr(clippy)` around this won't help, since Clippy can also be run from stable or beta toolchain. r? @Manishearth
2 parents 87e1957 + 4e5eba5 commit f11dae2

File tree

3 files changed

+1
-103
lines changed

3 files changed

+1
-103
lines changed

src/librustc/lint/levels.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ impl<'a> LintLevelsBuilder<'a> {
299299
"change it to",
300300
new_lint_name.to_string(),
301301
Applicability::MachineApplicable,
302-
).emit();
302+
).cancel();
303303

304304
let src = LintSource::Node(Symbol::intern(&new_lint_name), li.span);
305305
for id in ids {

src/test/ui-fulldeps/lint_tool_test.rs

-40
This file was deleted.

src/test/ui-fulldeps/lint_tool_test.stderr

-62
This file was deleted.

0 commit comments

Comments
 (0)