Merge #1570

1570: Prepare for clippy and rustfmt in rust-2018 r=jtgeibel a=jtgeibel

The first commit includes minor updates recommended by the clippy version which will be released with rust stable tomorrow.  In particular it uses the new lint attribute syntax like `#[allow(clippy::too_many_arguments)]`.  The second commit applies rustfmt changes.

This PR will fail on CI for now, but can be merged after the new stable release is published.

Co-authored-by: Justin Geibel <[email protected]>

Author: bors-voyager[bot]

.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/bin/delete-crate.rs

@@ -23,7 +23,8 @@ fn main() {
     conn.transaction::<_, diesel::result::Error, _>(|| {
         delete(&conn);
         Ok(())
-    }).unwrap()
+    })
+    .unwrap()
 }
 
 fn delete(conn: &PgConnection) {

src/bin/delete-version.rs

@@ -23,7 +23,8 @@ fn main() {
     conn.transaction::<_, diesel::result::Error, _>(|| {
         delete(&conn);
         Ok(())
-    }).unwrap()
+    })
+    .unwrap()
 }
 
 fn delete(conn: &PgConnection) {

src/bin/on_call/mod.rs

@@ -39,7 +39,8 @@ impl Event {
             .json(&FullEvent {
                 service_key,
                 event: self,
-            }).send()?;
+            })
+            .send()?;
 
         match response.status() {
             s if s.is_success() => Ok(()),

src/bin/populate.rs

@@ -39,7 +39,8 @@ fn update(conn: &PgConnection) -> QueryResult<()> {
                     version_downloads::version_id.eq(id),
                     version_downloads::downloads.eq(dls),
                     version_downloads::date.eq(date(now - day.days())),
-                )).execute(conn)?;
+                ))
+                .execute(conn)?;
         }
     }
     Ok(())

src/bin/render-readmes.rs

@@ -81,7 +81,8 @@ fn main() {
             readme_renderings::rendered_at
                 .lt(older_than)
                 .or(readme_renderings::version_id.is_null()),
-        ).select(versions::id)
+        )
+        .select(versions::id)
         .into_boxed();
 
     if let Some(crate_name) = args.flag_crate {
@@ -150,7 +151,8 @@ fn main() {
                         &readme_path,
                         readme.into_bytes(),
                         "text/html",
-                    ).unwrap_or_else(|_| {
+                    )
+                    .unwrap_or_else(|_| {
                         panic!(
                             "[{}-{}] Couldn't upload file to S3",
                             krate_name, version.num
@@ -227,7 +229,8 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
                 .as_ref()
                 .map_or("README.md", |e| &**e),
             manifest.package.repository.as_ref().map(|e| &**e),
-        ).unwrap_or_else(|_| panic!("[{}-{}] Couldn't render README", krate_name, version.num))
+        )
+        .unwrap_or_else(|_| panic!("[{}-{}] Couldn't render README", krate_name, version.num))
     };
     return Some(rendered);
 
@@ -261,14 +264,16 @@ fn find_file_by_path<R: Read>(
                 };
                 filepath == path
             }
-        }).unwrap_or_else(|| {
+        })
+        .unwrap_or_else(|| {
             panic!(
                 "[{}-{}] couldn't open file: {}",
                 krate_name,
                 version.num,
                 path.display()
             )
-        }).unwrap_or_else(|_| {
+        })
+        .unwrap_or_else(|_| {
             panic!(
                 "[{}-{}] file is not present: {}",
                 krate_name,

src/bin/transfer-crates.rs

@@ -21,7 +21,8 @@ fn main() {
     conn.transaction::<_, diesel::result::Error, _>(|| {
         transfer(&conn);
         Ok(())
-    }).unwrap()
+    })
+    .unwrap()
 }
 
 fn transfer(conn: &PgConnection) {

src/bin/update-downloads.rs

@@ -92,7 +92,8 @@ fn collect(conn: &PgConnection, rows: &[VersionDownload]) -> QueryResult<()> {
                     crate_downloads::crate_id.eq(crate_id),
                     crate_downloads::downloads.eq(amt),
                     crate_downloads::date.eq(download.date),
-                )).on_conflict(crate_downloads::table.primary_key())
+                ))
+                .on_conflict(crate_downloads::table.primary_key())
                 .do_update()
                 .set(crate_downloads::downloads.eq(crate_downloads::downloads + amt))
                 .execute(conn)?;
@@ -136,7 +137,8 @@ mod test {
         let krate = NewCrate {
             name: "foo",
             ..Default::default()
-        }.create_or_update(&conn, None, user_id)
+        }
+        .create_or_update(&conn, None, user_id)
         .unwrap();
         let version = NewVersion::new(
             krate.id,
@@ -145,7 +147,8 @@ mod test {
             None,
             None,
             0,
-        ).unwrap();
+        )
+        .unwrap();
         let version = version.save(&conn, &[]).unwrap();
         (krate, version)
     }
@@ -176,7 +179,8 @@ mod test {
                 version_downloads::version_id.eq(version.id),
                 version_downloads::date.eq(date(now - 1.day())),
                 version_downloads::processed.eq(true),
-            )).execute(&conn)
+            ))
+            .execute(&conn)
             .unwrap();
 
         ::update(&conn).unwrap();
@@ -213,7 +217,8 @@ mod test {
                 version_downloads::counted.eq(2),
                 version_downloads::date.eq(date(now - 2.days())),
                 version_downloads::processed.eq(false),
-            )).execute(&conn)
+            ))
+            .execute(&conn)
             .unwrap();
         ::update(&conn).unwrap();
         let processed = version_downloads::table
@@ -236,7 +241,8 @@ mod test {
                 version_downloads::counted.eq(2),
                 version_downloads::date.eq(date(now)),
                 version_downloads::processed.eq(false),
-            )).execute(&conn)
+            ))
+            .execute(&conn)
             .unwrap();
         ::update(&conn).unwrap();
         let processed = version_downloads::table
@@ -269,13 +275,15 @@ mod test {
                 version_downloads::counted.eq(1),
                 version_downloads::date.eq(date(now)),
                 version_downloads::processed.eq(false),
-            )).execute(&conn)
+            ))
+            .execute(&conn)
             .unwrap();
         insert_into(version_downloads::table)
             .values((
                 version_downloads::version_id.eq(version.id),
                 version_downloads::date.eq(date(now - 1.day())),
-            )).execute(&conn)
+            ))
+            .execute(&conn)
             .unwrap();
 
         let version_before = versions::table
@@ -331,7 +339,8 @@ mod test {
                 version_downloads::counted.eq(2),
                 version_downloads::date.eq(date(now - 2.days())),
                 version_downloads::processed.eq(false),
-            )).execute(&conn)
+            ))
+            .execute(&conn)
             .unwrap();
 
         ::update(&conn).unwrap();

src/boot/categories.rs

@@ -107,7 +107,8 @@ pub fn sync_with_connection(toml_str: &str, conn: &PgConnection) -> CargoResult<
                 category.eq(c.name),
                 description.eq(c.description),
             )
-        }).collect::<Vec<_>>();
+        })
+        .collect::<Vec<_>>();
 
     conn.transaction(|| {
         let slugs = diesel::insert_into(categories)
@@ -117,7 +118,8 @@ pub fn sync_with_connection(toml_str: &str, conn: &PgConnection) -> CargoResult<
             .set((
                 category.eq(excluded(category)),
                 description.eq(excluded(description)),
-            )).returning(slug)
+            ))
+            .returning(slug)
             .get_results::<String>(&*conn)?;
 
         diesel::delete(categories)

src/controllers/crate_owner_invitation.rs

@@ -71,7 +71,8 @@ fn accept_invite(
                 owner_id: user_id,
                 created_by: pending_crate_owner.invited_by_user_id,
                 owner_kind: OwnerKind::User as i32,
-            }).on_conflict(crate_owners::table.primary_key())
+            })
+            .on_conflict(crate_owners::table.primary_key())
             .do_update()
             .set(crate_owners::deleted.eq(false))
             .execute(conn)?;