cargo fmt

Author: carols10cents

src/controllers/krate/publish.rs

@@ -108,7 +108,8 @@ pub fn publish(req: &mut dyn Request) -> CargoResult<Response> {
         // this file length.
         let file_length = read_le_u32(req.body())?;
 
-        let content_length = req.content_length()
+        let content_length = req
+            .content_length()
             .chain_error(|| human("missing header: Content-Length"))?;
         let max = krate
             .max_upload_size
@@ -130,9 +131,8 @@ pub fn publish(req: &mut dyn Request) -> CargoResult<Response> {
             license_file,
             // Downcast is okay because the file length must be less than the max upload size
             // to get here, and max upload sizes are way less than i32 max
-            Some(file_length as i32)
-        )?
-            .save(&conn, &new_crate.authors)?;
+            Some(file_length as i32),
+        )?.save(&conn, &new_crate.authors)?;
 
         // Link this new version to all dependencies
         let git_deps = dependency::add_dependencies(&conn, &new_crate.deps, version.id)?;
@@ -163,10 +163,15 @@ pub fn publish(req: &mut dyn Request) -> CargoResult<Response> {
         // If the git commands fail below, we shouldn't keep the crate on the
         // server.
         let max_unpack = cmp::max(app.config.max_unpack_size, max);
-        let (cksum, mut crate_bomb, mut readme_bomb) = app
-            .config
-            .uploader
-            .upload_crate(req, &krate, readme, file_length, max, max_unpack, vers)?;
+        let (cksum, mut crate_bomb, mut readme_bomb) = app.config.uploader.upload_crate(
+            req,
+            &krate,
+            readme,
+            file_length,
+            max,
+            max_unpack,
+            vers,
+        )?;
         version.record_readme_rendering(&conn)?;
 
         let mut hex_cksum = String::new();

src/models/version.rs

@@ -27,7 +27,7 @@ pub struct Version {
     pub features: serde_json::Value,
     pub yanked: bool,
     pub license: Option<String>,
-    pub crate_size: Option<i32>
+    pub crate_size: Option<i32>,
 }
 
 #[derive(Insertable, Debug)]
@@ -37,7 +37,7 @@ pub struct NewVersion {
     num: String,
     features: serde_json::Value,
     license: Option<String>,
-    crate_size: Option<i32>
+    crate_size: Option<i32>,
 }
 
 impl Version {
@@ -72,7 +72,7 @@ impl Version {
                 version_downloads: format!("/api/v1/crates/{}/{}/downloads", crate_name, num),
                 authors: format!("/api/v1/crates/{}/{}/authors", crate_name, num),
             },
-            crate_size
+            crate_size,
         }
     }
 
@@ -220,7 +220,7 @@ impl Queryable<versions::SqlType, Pg> for Version {
             features: row.6,
             yanked: row.7,
             license: row.8,
-            crate_size: row.9
+            crate_size: row.9,
         }
     }
 }

src/tests/all.rs

@@ -45,7 +45,7 @@ use models::{Crate, CrateDownload, CrateOwner, Dependency, Keyword, Team, User,
 use models::{NewCategory, NewCrate, NewTeam, NewUser, NewVersion};
 use schema::*;
 use views::krate_publish as u;
-use views::{EncodableCrate, EncodableVersion, EncodableKeyword};
+use views::{EncodableCrate, EncodableKeyword, EncodableVersion};
 
 macro_rules! t {
     ($e:expr) => {

src/tests/krate.rs

@@ -21,7 +21,7 @@ use tar;
 use cargo_registry::git;
 use cargo_registry::models::krate::MAX_NAME_LENGTH;
 
-use {CrateList, CrateMeta, GoodCrate, CrateResponse};
+use {CrateList, CrateMeta, CrateResponse, GoodCrate};
 
 use models::{ApiToken, Category, Crate};
 use schema::{crates, metadata, versions};
@@ -927,8 +927,10 @@ fn new_krate_gzip_bomb() {
     ::sign_in(&mut req, &app);
     let len = 512 * 1024;
     let mut body = io::repeat(0).take(len);
-    let body =
-        ::new_crate_to_body_with_io(&::new_crate("foo", "1.1.0"), &mut [("foo-1.1.0/a", &mut body, len)]);
+    let body = ::new_crate_to_body_with_io(
+        &::new_crate("foo", "1.1.0"),
+        &mut [("foo-1.1.0/a", &mut body, len)],
+    );
     let json = bad_resp!(middle.call(req.with_body(&body)));
     assert!(
         json.errors[0]
@@ -1308,7 +1310,9 @@ fn dependencies() {
         let conn = app.diesel_database.get().unwrap();
         let user = ::new_user("foo").create_or_update(&conn).unwrap();
         let c1 = ::CrateBuilder::new("foo_deps", user.id).expect_build(&conn);
-        let v = ::new_version(c1.id, "1.0.0", None).save(&conn, &[]).unwrap();
+        let v = ::new_version(c1.id, "1.0.0", None)
+            .save(&conn, &[])
+            .unwrap();
         let c2 = ::CrateBuilder::new("bar_deps", user.id).expect_build(&conn);
         ::new_dependency(&conn, &v, &c2);
     }

src/tests/version.rs

@@ -10,7 +10,7 @@ use conduit::{Handler, Method};
 
 use schema::versions;
 use views::EncodableVersion;
-use {GoodCrate, CrateResponse};
+use {CrateResponse, GoodCrate};
 
 #[derive(Deserialize)]
 struct VersionList {
@@ -64,7 +64,9 @@ fn show() {
         let conn = app.diesel_database.get().unwrap();
         let user = ::new_user("foo").create_or_update(&conn).unwrap();
         let krate = ::CrateBuilder::new("foo_vers_show", user.id).expect_build(&conn);
-        ::new_version(krate.id, "2.0.0", Some(1234)).save(&conn, &[]).unwrap()
+        ::new_version(krate.id, "2.0.0", Some(1234))
+            .save(&conn, &[])
+            .unwrap()
     };
     req.with_path(&format!("/api/v1/versions/{}", v.id));
     let mut response = ok_resp!(middle.call(&mut req));
@@ -142,9 +144,17 @@ fn version_size() {
     let mut response = ok_resp!(middle.call(&mut show_req));
     let json: CrateResponse = ::json(&mut response);
 
-    let version1 = json.versions.iter().find(|v| v.num == "1.0.0").expect("Could not find v1.0.0");
+    let version1 = json
+        .versions
+        .iter()
+        .find(|v| v.num == "1.0.0")
+        .expect("Could not find v1.0.0");
     assert_eq!(version1.crate_size, Some(35));
 
-    let version2 = json.versions.iter().find(|v| v.num == "2.0.0").expect("Could not find v2.0.0");
+    let version2 = json
+        .versions
+        .iter()
+        .find(|v| v.num == "2.0.0")
+        .expect("Could not find v2.0.0");
     assert_eq!(version2.crate_size, Some(91));
 }

src/uploaders.rs

@@ -6,8 +6,8 @@ use s3;
 use semver;
 use tar;
 
-use util::{human, internal, CargoResult, ChainError};
 use util::LimitErrorReader;
+use util::{human, internal, CargoResult, ChainError};
 
 use std::env;
 use std::fs::{self, File};

src/views/mod.rs

@@ -193,7 +193,7 @@ pub struct EncodableVersion {
     // NOTE: Used by shields.io, altering `license` requires a PR with shields.io
     pub license: Option<String>,
     pub links: EncodableVersionLinks,
-    pub crate_size: Option<i32>
+    pub crate_size: Option<i32>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]