Clean up

Author: tobias-wilfert

relay-server/src/endpoints/playstation.rs

@@ -42,11 +42,9 @@ fn infer_attachment_type(_field_name: Option<&str>, file_name: &str) -> Attachme
 async fn extract_multipart(
     multipart: UnconstrainedMultipart,
     meta: RequestMeta,
-    state: &ServiceState,
+    config: &Config,
 ) -> Result<Box<Envelope>, BadStoreRequest> {
-    let mut items = multipart
-        .items(infer_attachment_type, state.config())
-        .await?;
+    let mut items = multipart.items(infer_attachment_type, config).await?;
 
     let prosperodump_item = items
         .iter_mut()
@@ -75,7 +73,7 @@ async fn handle(
 ) -> axum::response::Result<impl IntoResponse> {
     // The crash dumps are transmitted as `...` in a multipart form-data/ request.
     let multipart = request.extract_with_state(&state).await?;
-    let mut envelope = extract_multipart(multipart, meta, &state).await?;
+    let mut envelope = extract_multipart(multipart, meta, state.config()).await?;
     envelope.require_feature(Feature::PlaystationIngestion);
 
     let id = envelope.event_id();

relay-server/src/utils/multipart.rs

@@ -354,7 +354,8 @@ impl ConstrainedMultipart {
     where
         F: FnMut(Option<&str>, &str) -> AttachmentType,
     {
-        // We don't emit an outcome in this code branch since we return an error to the request
+        // The emit outcome closure here does nothing since in this code branch we don't want to
+        // emit outcomes as we already return an error to the request.
         multipart_items(self.0, infer_type, |_| (), config, false).await
     }
 }