From 9cc7f620aa74c36b06ee538229f60281481dc6d1 Mon Sep 17 00:00:00 2001 From: Romain Lebran Date: Fri, 9 Jun 2023 17:06:28 +0200 Subject: [PATCH] Remove unwrap from multipart ? Cleanup more unwrap. Switch inner field from Rc to Arc Wrap with mutex instead of refcell Arc for safety Revert "Arc for safety" This reverts commit d4262c76934b5b22237f4ba0202da34f76ec1456. Revert "Wrap with mutex instead of refcell" This reverts commit 5c0645efb4a66c8f24257244c9f0cd4201863733. Revert "Cleanup more unwrap. Switch inner field from Rc to Arc" This reverts commit fb6175d618d4ceae28a207a5e6a9c68ff8ded18d. --- actix-multipart/src/server.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actix-multipart/src/server.rs b/actix-multipart/src/server.rs index c08031eba..9babe31a0 100644 --- a/actix-multipart/src/server.rs +++ b/actix-multipart/src/server.rs @@ -465,7 +465,7 @@ impl Stream for Field { fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { let this = self.get_mut(); let mut inner = this.inner.borrow_mut(); - if let Some(mut buffer) = inner.payload.as_ref().unwrap().get_mut(&this.safety) { + if let Some(mut buffer) = inner.payload.as_ref().and_then(|p| p.get_mut(&this.safety)) { // check safety and poll read payload to buffer. buffer.poll_stream(cx)?; } else if !this.safety.is_clean() {