Move some code into PublishBuilder::body

Author: jtgeibel

src/tests/all.rs

@@ -44,7 +44,6 @@ use util::{Bad, RequestHelper, TestApp};
 use models::{Crate, CrateOwner, Dependency, Team, User, Version};
 use models::{NewCategory, NewTeam, NewUser};
 use schema::*;
-use views::krate_publish as u;
 use views::{EncodableCrate, EncodableKeyword, EncodableOwner, EncodableVersion, GoodCrate};
 
 macro_rules! t {
@@ -292,27 +291,3 @@ fn new_category<'a>(category: &'a str, slug: &'a str, description: &'a str) -> N
 fn logout(req: &mut Request) {
     req.mut_extensions().pop::<User>();
 }
-
-fn new_crate_to_body_with_tarball(new_crate: &u::EncodableCrateUpload, tarball: &[u8]) -> Vec<u8> {
-    let json = serde_json::to_string(&new_crate).unwrap();
-    let mut body = Vec::new();
-    body.extend(
-        [
-            json.len() as u8,
-            (json.len() >> 8) as u8,
-            (json.len() >> 16) as u8,
-            (json.len() >> 24) as u8,
-        ]
-            .iter()
-            .cloned(),
-    );
-    body.extend(json.as_bytes().iter().cloned());
-    body.extend(&[
-        tarball.len() as u8,
-        (tarball.len() >> 8) as u8,
-        (tarball.len() >> 16) as u8,
-        (tarball.len() >> 24) as u8,
-    ]);
-    body.extend(tarball);
-    body
-}

src/tests/builders.rs

@@ -495,7 +495,29 @@ impl PublishBuilder {
             links: None,
         };
 
-        ::new_crate_to_body_with_tarball(&new_crate, &self.tarball)
+        let json = serde_json::to_string(&new_crate).unwrap();
+        let mut body = Vec::new();
+        body.extend(
+            [
+                json.len() as u8,
+                (json.len() >> 8) as u8,
+                (json.len() >> 16) as u8,
+                (json.len() >> 24) as u8,
+            ]
+                .iter()
+                .cloned(),
+        );
+        body.extend(json.as_bytes().iter().cloned());
+
+        let tarball = &self.tarball;
+        body.extend(&[
+            tarball.len() as u8,
+            (tarball.len() >> 8) as u8,
+            (tarball.len() >> 16) as u8,
+            (tarball.len() >> 24) as u8,
+        ]);
+        body.extend(tarball);
+        body
     }
 }