berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 06eae018f1 into 891ab083c6

This commit is contained in:
Romain Lebran 2024-01-24 08:57:06 -08:00 committed by GitHub
parent 891ab083c6 06eae018f1
commit 44901eecd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actix-multipart/CHANGES.md
View File

@ -2,6 +2,8 @@
## Unreleased ## Unreleased
- Remove unnecessary `unwrap`. [#3047]
## 0.6.1 ## 0.6.1
- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency. - Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.

4
actix-multipart/src/server.rs
View File

@ -465,7 +465,7 @@ impl Stream for Field {
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
let this = self.get_mut(); let this = self.get_mut();
let mut inner = this.inner.borrow_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. // check safety and poll read payload to buffer.
buffer.poll_stream(cx)?; buffer.poll_stream(cx)?;
} else if !this.safety.is_clean() { } else if !this.safety.is_clean() {
@ -643,7 +643,7 @@ impl InnerField {
return Poll::Ready(None); return Poll::Ready(None);
} }
let result = if let Some(mut payload) = self.payload.as_ref().unwrap().get_mut(s) { let result = if let Some(mut payload) = self.payload.as_ref().and_then(|p| p.get_mut(s)) {
if !self.eof { if !self.eof {
let res = if let Some(ref mut len) = self.length { let res = if let Some(ref mut len) = self.length {
InnerField::read_len(&mut payload, len) InnerField::read_len(&mut payload, len)