Merge #1256

1256: Bump rustfmt and clippy on CI r=jtgeibel

Bump rustfmt and clippy and apply fixups.

Author: bors-voyager[bot]

.travis.yml

@@ -42,11 +42,11 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2017-12-28
+  - rust: nightly-2018-02-13
     script:
-    - cargo install --force rustfmt-nightly --vers 0.3.4
+    - cargo install --force rustfmt-nightly --vers 0.3.6
     - cargo fmt -- --write-mode=diff
-    - cargo install --force clippy --vers 0.0.177
+    - cargo install --force clippy --vers 0.0.186
     - cargo clippy
   - rust: stable
     script:

src/bin/render-readmes.rs

@@ -237,15 +237,11 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
             krate_name, version.num
         ))
     };
-    if manifest.package.readme.is_none() {
-        return None;
-    }
+
     let rendered = {
         let path = format!(
             "{}-{}/{}",
-            krate_name,
-            version.num,
-            manifest.package.readme.unwrap()
+            krate_name, version.num, manifest.package.readme?
         );
         let contents = find_file_by_path(&mut entries, Path::new(&path), version, krate_name);
         readme_to_html(
@@ -262,12 +258,14 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
         ))
     };
     return Some(rendered);
+
     #[derive(Deserialize)]
     struct Package {
         readme: Option<String>,
         readme_file: Option<String>,
         repository: Option<String>,
     }
+
     #[derive(Deserialize)]
     struct Manifest {
         package: Package,

src/crate_owner_invitation.rs

@@ -62,7 +62,8 @@ pub struct EncodableCrateOwnerInvitation {
     pub invited_by_username: String,
     pub crate_name: String,
     pub crate_id: i32,
-    #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
+    #[serde(with = "::util::rfc3339")]
+    pub created_at: NaiveDateTime,
 }
 
 /// Handles the `GET /me/crate_owner_invitations` route.

src/dependency.rs

@@ -28,8 +28,10 @@ pub struct Dependency {
 
 #[derive(Debug, QueryableByName)]
 pub struct ReverseDependency {
-    #[diesel(embed)] dependency: Dependency,
-    #[sql_type = "::diesel::sql_types::Integer"] crate_downloads: i32,
+    #[diesel(embed)]
+    dependency: Dependency,
+    #[sql_type = "::diesel::sql_types::Integer"]
+    crate_downloads: i32,
     #[sql_type = "::diesel::sql_types::Text"]
     #[column_name = "crate_name"]
     name: String,

src/krate/metadata.rs

@@ -142,7 +142,8 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
 
     #[derive(Serialize)]
     struct R {
-        #[serde(rename = "crate")] krate: EncodableCrate,
+        #[serde(rename = "crate")]
+        krate: EncodableCrate,
         versions: Vec<EncodableVersion>,
         keywords: Vec<EncodableKeyword>,
         categories: Vec<EncodableCategory>,

src/krate/mod.rs

@@ -98,12 +98,14 @@ type ByName<'a> = diesel::dsl::Filter<All, WithName<'a>>;
 pub struct EncodableCrate {
     pub id: String,
     pub name: String,
-    #[serde(with = "::util::rfc3339")] pub updated_at: NaiveDateTime,
+    #[serde(with = "::util::rfc3339")]
+    pub updated_at: NaiveDateTime,
     pub versions: Option<Vec<i32>>,
     pub keywords: Option<Vec<String>>,
     pub categories: Option<Vec<String>>,
     pub badges: Option<Vec<EncodableBadge>>,
-    #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
+    #[serde(with = "::util::rfc3339")]
+    pub created_at: NaiveDateTime,
     pub downloads: i32,
     pub recent_downloads: Option<i64>,
     pub max_version: String,

src/krate/publish.rs

@@ -177,7 +177,8 @@ pub fn publish(req: &mut Request) -> CargoResult<Response> {
 
         #[derive(Serialize)]
         struct R<'a> {
-            #[serde(rename = "crate")] krate: EncodableCrate,
+            #[serde(rename = "crate")]
+            krate: EncodableCrate,
             warnings: Warnings<'a>,
         }
         Ok(req.json(&R {

src/tests/all.rs

@@ -100,7 +100,8 @@ mod version;
 
 #[derive(Deserialize, Debug)]
 struct GoodCrate {
-    #[serde(rename = "crate")] krate: EncodableCrate,
+    #[serde(rename = "crate")]
+    krate: EncodableCrate,
     warnings: Warnings,
 }
 #[derive(Deserialize)]

src/tests/krate.rs

@@ -31,7 +31,8 @@ struct VersionsList {
 }
 #[derive(Deserialize)]
 struct CrateResponse {
-    #[serde(rename = "crate")] krate: EncodableCrate,
+    #[serde(rename = "crate")]
+    krate: EncodableCrate,
     versions: Vec<EncodableVersion>,
     keywords: Vec<EncodableKeyword>,
 }

src/tests/schema_details.rs

@@ -46,15 +46,17 @@ struct FkConstraint {
     #[sql_type = "Text"]
     #[column_name = "conname"]
     name: String,
-    #[sql_type = "Text"] definition: String,
+    #[sql_type = "Text"]
+    definition: String,
 }
 
 #[derive(QueryableByName)]
 struct TableNameAndConstraint {
     #[sql_type = "Text"]
     #[column_name = "relname"]
     table_name: String,
-    #[diesel(embed)] constraint: Option<FkConstraint>,
+    #[diesel(embed)]
+    constraint: Option<FkConstraint>,
 }
 
 fn get_fk_constraint_definitions(column_name: &str) -> Vec<TableNameAndConstraint> {