Merge #1147

1147: Bump clippy and rustfmt r=carols10cents

Bump clippy and rustfmt to versions compatible with the latest nightly compiler.

Author: bors-voyager[bot]

.travis.yml

@@ -39,10 +39,10 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2017-09-20
+  - rust: nightly-2017-11-07
     env: RUSTFMT=YESPLEASE
     script:
-    - cargo install --force rustfmt-nightly --vers 0.2.7
+    - cargo install --force rustfmt-nightly --vers 0.2.15
     - export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib:$LD_LIBRARY_PATH
     - rustfmt --version
     - cargo fmt -- --write-mode=diff
@@ -51,7 +51,7 @@ matrix:
     - cargo build
     - cargo test
     - npm test
-  - rust: nightly-2017-09-20
+  - rust: nightly-2017-11-07
     env: CLIPPY=YESPLEASE
     script:
     - cargo check --features "lint"

Cargo.lock

@@ -53,7 +53,7 @@ diesel_full_text_search = "0.16.0"
 serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
-clippy = { version = "=0.0.162", optional = true }
+clippy = { version = "=0.0.169", optional = true }
 chrono = { version = "0.4.0", features = ["serde"] }
 comrak = { version = "0.2.3", default-features = false }
 ammonia = { git = "https://github.com/notriddle/ammonia", rev = "3d4e4073f8cdb7c60203b9036c09f4385a2fdbbd" }

Cargo.toml

@@ -107,7 +107,9 @@ impl Badge {
             delete(badges::table)
                 .filter(badges::crate_id.eq(krate.id))
                 .execute(conn)?;
-            insert_into(badges::table).values(&new_badges).execute(conn)?;
+            insert_into(badges::table)
+                .values(&new_badges)
+                .execute(conn)?;
             Ok(invalid_badges)
         })
     }

src/badge.rs

@@ -1,3 +1,4 @@
+#[allow(unused_imports)] // TODO: Remove when rustc 1.23 is stable
 use std::ascii::AsciiExt;
 
 use chrono::NaiveDateTime;
@@ -127,7 +128,9 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
         query = query.order(keywords::keyword.asc());
     }
 
-    let data = query.paginate(limit, offset).load::<(Keyword, i64)>(&*conn)?;
+    let data = query
+        .paginate(limit, offset)
+        .load::<(Keyword, i64)>(&*conn)?;
     let total = data.get(0).map(|&(_, t)| t).unwrap_or(0);
     let kws = data.into_iter()
         .map(|(k, _)| k.encodable())

src/keyword.rs

@@ -41,7 +41,7 @@ pub fn summary(req: &mut Request) -> CargoResult<Response> {
             .map(|versions| Version::max(versions.into_iter().map(|v| v.num)))
             .zip(krates)
             .map(|(max_version, krate)| {
-                Ok(krate.minimal_encodable(max_version, None, false, None))
+                Ok(krate.minimal_encodable(&max_version, None, false, None))
             })
             .collect()
     };
@@ -153,7 +153,7 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
     Ok(
         req.json(&R {
             krate: krate.clone().encodable(
-                max_version,
+                &max_version,
                 Some(ids),
                 Some(&kws),
                 Some(&cats),

src/krate/metadata.rs

@@ -1,3 +1,4 @@
+#[allow(unused_imports)] // TODO: Remove when rustc 1.23 is stable
 use std::ascii::AsciiExt;
 
 use chrono::{NaiveDate, NaiveDateTime};
@@ -26,7 +27,7 @@ pub mod metadata;
 
 /// Hosts in this blacklist are known to not be hosting documentation,
 /// and are possibly of malicious intent e.g. ad tracking networks, etc.
-const DOCUMENTATION_BLACKLIST: [&'static str; 1] = ["rust-ci.org"];
+const DOCUMENTATION_BLACKLIST: [&str; 1] = ["rust-ci.org"];
 
 #[derive(Debug, Insertable, Queryable, Identifiable, Associations, AsChangeset, Clone, Copy)]
 #[belongs_to(Crate)]
@@ -315,7 +316,7 @@ impl Crate {
 
     pub fn minimal_encodable(
         self,
-        max_version: semver::Version,
+        max_version: &semver::Version,
         badges: Option<Vec<Badge>>,
         exact_match: bool,
         recent_downloads: Option<i64>,
@@ -334,7 +335,7 @@ impl Crate {
     #[cfg_attr(feature = "clippy", allow(too_many_arguments))]
     pub fn encodable(
         self,
-        max_version: semver::Version,
+        max_version: &semver::Version,
         versions: Option<Vec<i32>>,
         keywords: Option<&[Keyword]>,
         categories: Option<&[Category]>,

src/krate/mod.rs

@@ -181,7 +181,7 @@ pub fn publish(req: &mut Request) -> CargoResult<Response> {
             warnings: Warnings<'a>,
         }
         Ok(req.json(&R {
-            krate: krate.minimal_encodable(max_version, None, false, None),
+            krate: krate.minimal_encodable(&max_version, None, false, None),
             warnings: warnings,
         }))
     })

src/krate/publish.rs

@@ -201,7 +201,7 @@ pub fn search(req: &mut Request) -> CargoResult<Response> {
                     .filter(badges::crate_id.eq(krate.id))
                     .load::<Badge>(&*conn)?;
                 Ok(krate.minimal_encodable(
-                    max_version,
+                    &max_version,
                     Some(badges),
                     perfect_match,
                     Some(recent_downloads),

src/krate/search.rs

@@ -1,4 +1,4 @@
-//! This crate implements the backend server for https://crates.io/
+//! This crate implements the backend server for <https://crates.io/>
 //!
 //! All implemented routes are defined in the [middleware](fn.middleware.html) function and
 //! implemented in the [category](category/index.html), [keyword](keyword/index.html),

src/lib.rs

@@ -270,7 +270,8 @@ mod tests {
 
     #[test]
     fn text_with_inline_javascript() {
-        let text = r#"foo_readme\n\n<a href="https://crates.io/crates/cargo-registry" onclick="window.alert('Got you')">Crate page</a>"#;
+        let text =
+            r#"foo_readme\n\n<a href="https://crates.io/crates/cargo-registry" onclick="window.alert('Got you')">Crate page</a>"#;
         let result = markdown_to_html(text, None).unwrap();
         assert_eq!(
             result,
@@ -345,7 +346,8 @@ mod tests {
 
     #[test]
     fn absolute_links_dont_get_resolved() {
-        let readme_text = "[![Crates.io](https://img.shields.io/crates/v/clap.svg)](https://crates.io/crates/clap)";
+        let readme_text =
+            "[![Crates.io](https://img.shields.io/crates/v/clap.svg)](https://crates.io/crates/clap)";
         let repository = "https://github.com/kbknapp/clap-rs/";
         let result = markdown_to_html(readme_text, Some(&repository)).unwrap();
 
@@ -387,7 +389,8 @@ mod tests {
 
     #[test]
     fn manual_anchor_is_sanitized() {
-        let text = "<h1><a href=\"#my-crate\" id=\"my-crate\"></a>My crate</h1>\n<p>Hello, world!</p>\n";
+        let text =
+            "<h1><a href=\"#my-crate\" id=\"my-crate\"></a>My crate</h1>\n<p>Hello, world!</p>\n";
         let result = markdown_to_html(text, None).unwrap();
         assert_eq!(
             result,

src/render.rs

@@ -408,7 +408,8 @@ impl<'a> CrateBuilder<'a> {
     fn build(mut self, connection: &PgConnection) -> CargoResult<Crate> {
         use diesel::{insert_into, update};
 
-        let mut krate = self.krate.create_or_update(connection, None, self.owner_id)?;
+        let mut krate = self.krate
+            .create_or_update(connection, None, self.owner_id)?;
 
         // Since we are using `NewCrate`, we can't set all the
         // crate properties in a single DB call.

src/tests/all.rs

@@ -381,7 +381,8 @@ fn test_github_login_does_not_overwrite_email() {
     assert_eq!(r.user.email, None);
     assert_eq!(r.user.login, "apricot");
 
-    let body = r#"{"user":{"email":"[email protected]","name":"Apricot Apricoto","login":"apricot","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/apricot","kind":null}}"#;
+    let body =
+        r#"{"user":{"email":"[email protected]","name":"Apricot Apricoto","login":"apricot","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/apricot","kind":null}}"#;
     let mut response = ok_resp!(
         middle.call(
             req.with_path(&format!("/api/v1/users/{}", user.id))
@@ -440,7 +441,8 @@ fn test_email_get_and_put() {
     assert_eq!(r.user.email, None);
     assert_eq!(r.user.login, "mango");
 
-    let body = r#"{"user":{"email":"[email protected]","name":"Mango McMangoface","login":"mango","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/mango","kind":null}}"#;
+    let body =
+        r#"{"user":{"email":"[email protected]","name":"Mango McMangoface","login":"mango","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/mango","kind":null}}"#;
     let mut response = ok_resp!(
         middle.call(
             req.with_path(&format!("/api/v1/users/{}", user.id))
@@ -479,7 +481,8 @@ fn test_empty_email_not_added() {
         user
     };
 
-    let body = r#"{"user":{"email":"","name":"Papayo Papaya","login":"papaya","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/papaya","kind":null}}"#;
+    let body =
+        r#"{"user":{"email":"","name":"Papayo Papaya","login":"papaya","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/papaya","kind":null}}"#;
     let json = bad_resp!(
         middle.call(
             req.with_path(&format!("/api/v1/users/{}", user.id))
@@ -494,7 +497,8 @@ fn test_empty_email_not_added() {
         json.errors
     );
 
-    let body = r#"{"user":{"email":null,"name":"Papayo Papaya","login":"papaya","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/papaya","kind":null}}"#;
+    let body =
+        r#"{"user":{"email":null,"name":"Papayo Papaya","login":"papaya","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/papaya","kind":null}}"#;
     let json = bad_resp!(
         middle.call(
             req.with_path(&format!("/api/v1/users/{}", user.id))
@@ -531,7 +535,8 @@ fn test_this_user_cannot_change_that_user_email() {
         unsigned_user
     };
 
-    let body = r#"{"user":{"email":"[email protected]","name":"Pine Apple","login":"pineapple","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/pineapple","kind":null}}"#;
+    let body =
+        r#"{"user":{"email":"[email protected]","name":"Pine Apple","login":"pineapple","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/pineapple","kind":null}}"#;
 
     let json = bad_resp!(
         middle.call(
@@ -642,7 +647,8 @@ fn test_insert_into_email_table_with_email_change() {
     assert!(!r.user.email_verified);
     assert!(r.user.email_verification_sent);
 
-    let body = r#"{"user":{"email":"[email protected]","name":"potato","login":"potato","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/potato","kind":null}}"#;
+    let body =
+        r#"{"user":{"email":"[email protected]","name":"potato","login":"potato","avatar":"https://avatars0.githubusercontent.com","url":"https://github.com/potato","kind":null}}"#;
     let mut response = ok_resp!(
         middle.call(
             req.with_path(&format!("/api/v1/users/{}", user.id))

src/tests/user.rs

@@ -191,7 +191,7 @@ impl Uploader {
     }
 
     /// Deletes an uploaded file.
-    fn delete(&self, app: Arc<App>, path: &str) -> CargoResult<()> {
+    fn delete(&self, app: &Arc<App>, path: &str) -> CargoResult<()> {
         match *self {
             Uploader::S3 { ref bucket, .. } => {
                 let mut handle = app.handle();
@@ -217,7 +217,7 @@ pub struct Bomb {
 impl Drop for Bomb {
     fn drop(&mut self) {
         if let Some(ref path) = self.path {
-            if let Err(e) = self.app.config.uploader.delete(Arc::clone(&self.app), path) {
+            if let Err(e) = self.app.config.uploader.delete(&self.app, path) {
                 println!("unable to delete {}, {:?}", path, e);
             }
         }

src/uploaders.rs

@@ -243,7 +243,7 @@ impl User {
 /// This route will return an authorization URL for the GitHub OAuth flow including the crates.io
 /// `client_id` and a randomly generated `state` secret.
 ///
-/// see https://developer.github.com/v3/oauth/#redirect-users-to-request-github-access
+/// see <https://developer.github.com/v3/oauth/#redirect-users-to-request-github-access>
 ///
 /// ## Response Body Example
 ///
@@ -279,7 +279,7 @@ pub fn github_authorize(req: &mut Request) -> CargoResult<Response> {
 /// to exchange the temporary `code` for an API token. The API token is returned together with
 /// the corresponding user information.
 ///
-/// see https://developer.github.com/v3/oauth/#github-redirects-back-to-your-site
+/// see <https://developer.github.com/v3/oauth/#github-redirects-back-to-your-site>
 ///
 /// ## Query Parameters
 ///

src/user/mod.rs

@@ -342,7 +342,7 @@ pub fn human<S: ToString + ?Sized>(error: &S) -> Box<CargoError> {
 
 /// This is intended to be used for errors being sent back to the Ember
 /// frontend, not to cargo as cargo does not handle non-200 response codes well
-/// (see https://github.com/rust-lang/cargo/issues/3995), but Ember requires
+/// (see <https://github.com/rust-lang/cargo/issues/3995>), but Ember requires
 /// non-200 response codes for its stores to work properly.
 ///
 /// Since this is going back to the UI these errors are treated the same as

src/util/errors.rs

@@ -24,11 +24,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
     // Extract all ids requested.
     let query = url::form_urlencoded::parse(req.query_string().unwrap_or("").as_bytes());
     let ids = query
-        .filter_map(|(ref a, ref b)| if *a == "ids[]" {
-            b.parse().ok()
-        } else {
-            None
-        })
+        .filter_map(|(ref a, ref b)| if *a == "ids[]" { b.parse().ok() } else { None })
         .collect::<Vec<i32>>();
 
     let versions = versions::table