Bump rustfmt to latest nightly

Author: jtgeibel

.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

src/badge.rs

@@ -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/keyword.rs

@@ -128,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/render.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/tests/all.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/user.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/version/deprecated.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