Switch to the new tool attribute syntax

Author: jtgeibel

.travis.yml

@@ -54,8 +54,7 @@ matrix:
         - rustup component add clippy-preview
       script:
         - cargo fmt -- --check
-        # TODO: Once clippy:: lint syntax is stable, remove everything after the -- below
-        - cargo clippy --all-targets -- -A renamed_and_removed_lints
+        - cargo clippy --all-targets --all-features --all
         - cargo build
         - cargo test
         - npm install

src/models/krate.rs

@@ -306,7 +306,7 @@ impl Crate {
         )
     }
 
-    #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
+    #[allow(clippy::too_many_arguments)]
     pub fn encodable(
         self,
         max_version: &semver::Version,

src/models/version.rs

@@ -114,6 +114,7 @@ impl Version {
 }
 
 impl NewVersion {
+    #[allow(clippy::new_ret_no_self)]
     pub fn new(
         crate_id: i32,
         num: &semver::Version,

src/tests/all.rs

@@ -1,9 +1,6 @@
 #![deny(warnings)]
 #![allow(unknown_lints, proc_macro_derive_resolution_fallback)] // TODO: This can be removed after diesel-1.4
 
-// Several test methods trip this clippy lint
-#![cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))]
-
 extern crate cargo_registry;
 extern crate chrono;
 extern crate conduit;

src/tests/category.rs

@@ -73,6 +73,7 @@ fn show() {
 }
 
 #[test]
+#[allow(clippy::cyclomatic_complexity)]
 fn update_crate() {
     let (_b, app, middle) = app();
     let mut req = req(Method::Get, "/api/v1/categories/foo");

src/tests/krate.rs

@@ -104,6 +104,7 @@ fn index() {
 }
 
 #[test]
+#[allow(clippy::cyclomatic_complexity)]
 fn index_queries() {
     let (app, anon, user) = TestApp::init().with_user();
     let user = user.as_model();
@@ -324,6 +325,7 @@ fn index_sorting() {
 }
 
 #[test]
+#[allow(clippy::cyclomatic_complexity)]
 fn exact_match_on_queries_with_sort() {
     let (app, anon, user) = TestApp::init().with_user();
     let user = user.as_model();
@@ -1368,6 +1370,7 @@ fn yank_not_owner() {
 }
 
 #[test]
+#[allow(clippy::cyclomatic_complexity)]
 fn yank_max_version() {
     let (_, anon, _, token) = TestApp::with_proxy().with_token();
 

src/tests/record.rs

@@ -32,7 +32,7 @@ use new_user;
 pub struct Bomb {
     iorx: Sink,
     quittx: Option<oneshot::Sender<()>>,
-    #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))]
+    #[allow(clippy::type_complexity)]
     thread: Option<thread::JoinHandle<Option<(Vec<u8>, PathBuf)>>>,
 }
 

src/util/request_helpers.rs

@@ -13,6 +13,6 @@ use conduit::Request;
 pub fn request_header<'a>(req: &'a dyn Request, header_name: &str) -> &'a str {
     req.headers()
         .find(header_name)
-        .and_then(|x| x.first().map(|&s| s))
+        .and_then(|x| x.first().cloned())
         .unwrap_or_default()
 }