aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2018-07-01 22:20:29 +0200
committerChristian Duerr <chrisduerr@users.noreply.github.com>2018-07-01 20:20:29 +0000
commit985ba306c78857e07f3f267ab954ad069d30a465 (patch)
treeb953bb0f74620adeac7771c788f874aae872cc87
parent12f952df42941be8a94a90f9a029e041c9281142 (diff)
downloadalacritty-985ba306c78857e07f3f267ab954ad069d30a465.tar.gz
alacritty-985ba306c78857e07f3f267ab954ad069d30a465.zip
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.
-rw-r--r--.travis.yml2
-rw-r--r--src/lib.rs3
-rw-r--r--src/util.rs1
3 files changed, 1 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 2b6192d7..2dd8a4f0 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 afbd8595..d6229ee7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -110,9 +110,6 @@ impl Mul<f32> 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 062e7651..6065e01b 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
}