Skip to content

Commit

Permalink
Auto merge of #54358 - flip1995:beta, r=Manishearth
Browse files Browse the repository at this point in the history
 [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
  • Loading branch information
bors committed Oct 3, 2018
2 parents 87e1957 + 4e5eba5 commit f11dae2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 103 deletions.
2 changes: 1 addition & 1 deletion src/librustc/lint/levels.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ impl<'a> LintLevelsBuilder<'a> {
"change it to",
new_lint_name.to_string(),
Applicability::MachineApplicable,
).emit();
).cancel();

let src = LintSource::Node(Symbol::intern(&new_lint_name), li.span);
for id in ids {
Expand Down
40 changes: 0 additions & 40 deletions src/test/ui-fulldeps/lint_tool_test.rs

This file was deleted.

62 changes: 0 additions & 62 deletions src/test/ui-fulldeps/lint_tool_test.stderr

This file was deleted.

0 comments on commit f11dae2

Please sign in to comment.