From 985ba306c78857e07f3f267ab954ad069d30a465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sun, 1 Jul 2018 22:20:29 +0200 Subject: [PATCH] Remove unnecessary clippy lint annotations We moved to "cargo clippy" in 5ba34d4f9766a55a06ed5e3e44cc384af1b09f65 and removing the clippy lint annotations in `src/lib.rs` does not cause any additional warnings. This also changes `cargo clippy` to use the flags required for checking integration tests. --- .travis.yml | 2 +- src/lib.rs | 3 --- src/util.rs | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b6192d..2dd8a4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,5 +29,5 @@ matrix: - rust: nightly script: - - if [ -n "$CLIPPY" ]; then cargo clippy; fi + - if [ -n "$CLIPPY" ]; then cargo clippy --all-features --all-targets; fi - if [ -z "$CLIPPY" ]; then cargo test; fi diff --git a/src/lib.rs b/src/lib.rs index afbd859..d6229ee 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -110,9 +110,6 @@ impl Mul for Rgb { } -#[cfg_attr(feature = "clippy", allow(too_many_arguments))] -#[cfg_attr(feature = "clippy", allow(doc_markdown))] -#[cfg_attr(feature = "clippy", allow(unreadable_literal))] #[allow(unused_mut)] pub mod gl { #![allow(non_upper_case_globals)] diff --git a/src/util.rs b/src/util.rs index 062e765..6065e01 100644 --- a/src/util.rs +++ b/src/util.rs @@ -15,7 +15,6 @@ use std::cmp; #[cfg(not(feature = "nightly"))] #[inline(always)] -#[cfg_attr(feature = "clippy", allow(inline_always))] pub unsafe fn unlikely(x: bool) -> bool { x }