actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-30 10:42:55 +01:00
Code Issues Releases Wiki Activity

remove usage of actix_utils::mpsc (#2023)

Browse Source
This commit is contained in:
Rob Ede 2021-02-24 09:08:56 +00:00 committed by GitHub
parent d92ab7e8e0
commit f6393728c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-multipart/Cargo.toml
View File

@ -22,7 +22,7 @@ actix-utils = "3.0.0-beta.2"
bytes = "1" bytes = "1"
derive_more = "0.99.5" derive_more = "0.99.5"
httparse = "1.3" httparse = "1.3"
futures-util = { version = "0.3.7", default-features = false } futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
log = "0.4" log = "0.4"
mime = "0.3" mime = "0.3"
twoway = "0.2" twoway = "0.2"
@ -30,3 +30,5 @@ twoway = "0.2"
[dev-dependencies] [dev-dependencies]
actix-rt = "2" actix-rt = "2"
actix-http = "3.0.0-beta.3" actix-http = "3.0.0-beta.3"
tokio = { version = "1", features = ["sync"] }
tokio-stream = "0.1"

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

@ -804,12 +804,13 @@ mod tests {
use super::*; use super::*;
use actix_http::h1::Payload; use actix_http::h1::Payload;
use actix_utils::mpsc;
use actix_web::http::header::{DispositionParam, DispositionType}; use actix_web::http::header::{DispositionParam, DispositionType};
use actix_web::test::TestRequest; use actix_web::test::TestRequest;
use actix_web::FromRequest; use actix_web::FromRequest;
use bytes::Bytes; use bytes::Bytes;
use futures_util::future::lazy; use futures_util::future::lazy;
use tokio::sync::mpsc;
use tokio_stream::wrappers::UnboundedReceiverStream;
#[actix_rt::test] #[actix_rt::test]
async fn test_boundary() { async fn test_boundary() {
@ -855,13 +856,17 @@ mod tests {
} }
fn create_stream() -> ( fn create_stream() -> (
mpsc::Sender<Result<Bytes, PayloadError>>, mpsc::UnboundedSender<Result<Bytes, PayloadError>>,
impl Stream<Item = Result<Bytes, PayloadError>>, impl Stream<Item = Result<Bytes, PayloadError>>,
) { ) {
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::unbounded_channel();
(tx, rx.map(|res| res.map_err(|_| panic!()))) (
tx,
UnboundedReceiverStream::new(rx).map(|res| res.map_err(|_| panic!())),
)
} }
// Stream that returns from a Bytes, one char at a time and Pending every other poll() // Stream that returns from a Bytes, one char at a time and Pending every other poll()
struct SlowStream { struct SlowStream {
bytes: Bytes, bytes: Bytes,
@ -889,9 +894,11 @@ mod tests {
cx.waker().wake_by_ref(); cx.waker().wake_by_ref();
return Poll::Pending; return Poll::Pending;
} }
if this.pos == this.bytes.len() { if this.pos == this.bytes.len() {
return Poll::Ready(None); return Poll::Ready(None);
} }
let res = Poll::Ready(Some(Ok(this.bytes.slice(this.pos..(this.pos + 1))))); let res = Poll::Ready(Some(Ok(this.bytes.slice(this.pos..(this.pos + 1)))));
this.pos += 1; this.pos += 1;
this.ready = false; this.ready = false;