controllers/krate/publish: Inline Maximums calculation

This is only used in the publish endpoint, and can apparently be written quite a bit more concise... :D

Author: Turbo87

src/controllers/krate/publish.rs

@@ -37,7 +37,6 @@ use crate::rate_limiter::LimitedAction;
 use crate::schema::*;
 use crate::sql::canon_crate_name;
 use crate::util::errors::{bad_request, custom, internal, AppResult, BoxedAppError};
-use crate::util::Maximums;
 use crate::views::{
     EncodableCrate, EncodableCrateDependency, GoodCrate, PublishMetadata, PublishWarnings,
 };
@@ -146,18 +145,18 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
         .check_rate_limit(auth.user().id, rate_limit_action, &mut conn)
         .await?;
 
-    let maximums = Maximums::new(
-        existing_crate.as_ref().and_then(|c| c.max_upload_size),
-        app.config.max_upload_size,
-        app.config.max_unpack_size,
-    );
+    let max_upload_size = existing_crate
+        .as_ref()
+        .and_then(|c| c.max_upload_size)
+        .and_then(|m| u32::try_from(m).ok())
+        .unwrap_or(app.config.max_upload_size);
 
-    let tarball_bytes = read_tarball_bytes(&mut reader, maximums.max_upload_size).await?;
+    let tarball_bytes = read_tarball_bytes(&mut reader, max_upload_size).await?;
     let content_length = tarball_bytes.len() as u64;
 
     let pkg_name = format!("{}-{}", &*metadata.name, &version_string);
-    let tarball_info =
-        process_tarball(&pkg_name, &*tarball_bytes, maximums.max_unpack_size).await?;
+    let max_unpack_size = std::cmp::max(app.config.max_unpack_size, max_upload_size as u64);
+    let tarball_info = process_tarball(&pkg_name, &*tarball_bytes, max_unpack_size).await?;
 
     // `unwrap()` is safe here since `process_tarball()` validates that
     // we only accept manifests with a `package` section and without

src/util.rs

@@ -1,5 +1,3 @@
-use std::cmp;
-
 pub use self::bytes_request::BytesRequest;
 pub use self::io_util::{read_fill, read_le_u32};
 pub use self::request_helpers::*;
@@ -12,25 +10,3 @@ mod request_helpers;
 pub mod rfc3339;
 pub mod token;
 pub mod tracing;
-
-#[derive(Debug, Copy, Clone)]
-pub struct Maximums {
-    pub max_upload_size: u32,
-    pub max_unpack_size: u64,
-}
-
-impl Maximums {
-    pub fn new(
-        krate_max_upload: Option<i32>,
-        app_max_upload: u32,
-        app_max_unpack: u64,
-    ) -> Maximums {
-        let krate_max_upload = krate_max_upload.and_then(|m| u32::try_from(m).ok());
-        let max_upload_size = krate_max_upload.unwrap_or(app_max_upload);
-        let max_unpack_size = cmp::max(app_max_unpack, max_upload_size as u64);
-        Maximums {
-            max_upload_size,
-            max_unpack_size,
-        }
-    }
-}