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

fix actix-web-actors build

This commit is contained in:
fakeshadow 2021-01-02 10:42:14 +08:00
parent 35138f30b0
commit 5e0bf67a2e
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -131,7 +131,6 @@ actix-multipart = { path = "actix-multipart" }
actix-files = { path = "actix-files" } actix-files = { path = "actix-files" }
awc = { path = "awc" } awc = { path = "awc" }
actix = { git = "https://github.com/actix/actix.git", branch = "master" }
actix-tls = { git = "https://github.com/actix/actix-net.git", branch = "master" } actix-tls = { git = "https://github.com/actix/actix-net.git", branch = "master" }
actix-server = { git = "https://github.com/actix/actix-net.git", branch = "master" } actix-server = { git = "https://github.com/actix/actix-net.git", branch = "master" }
actix-service = { git = "https://github.com/actix/actix-net.git", branch = "master" } actix-service = { git = "https://github.com/actix/actix-net.git", branch = "master" }

2
actix-web-actors/Cargo.toml
View File

@ -22,9 +22,9 @@ actix-http = "2.0.0"
actix-web = { version = "3.0.0", default-features = false } actix-web = { version = "3.0.0", default-features = false }
bytes = "1" bytes = "1"
futures-channel = { version = "0.3.7", default-features = false }
futures-core = { version = "0.3.7", default-features = false } futures-core = { version = "0.3.7", default-features = false }
pin-project = "1.0.0" pin-project = "1.0.0"
tokio = { version = "1", features = ["sync"] }
[dev-dependencies] [dev-dependencies]
actix-rt = "2.0.0-beta.1" actix-rt = "2.0.0-beta.1"

2
actix-web-actors/src/context.rs
View File

@ -12,8 +12,8 @@ use actix::{
}; };
use actix_web::error::Error; use actix_web::error::Error;
use bytes::Bytes; use bytes::Bytes;
use futures_channel::oneshot::Sender;
use futures_core::Stream; use futures_core::Stream;
use tokio::sync::oneshot::Sender;
/// Execution context for http actors /// Execution context for http actors
pub struct HttpContext<A> pub struct HttpContext<A>

2
actix-web-actors/src/ws.rs
View File

@ -24,8 +24,8 @@ use actix_web::error::{Error, PayloadError};
use actix_web::http::{header, Method, StatusCode}; use actix_web::http::{header, Method, StatusCode};
use actix_web::{HttpRequest, HttpResponse}; use actix_web::{HttpRequest, HttpResponse};
use bytes::{Bytes, BytesMut}; use bytes::{Bytes, BytesMut};
use futures_channel::oneshot::Sender;
use futures_core::Stream; use futures_core::Stream;
use tokio::sync::oneshot::Sender;
/// Do websocket handshake and start ws actor. /// Do websocket handshake and start ws actor.
pub fn start<A, T>(actor: A, req: &HttpRequest, stream: T) -> Result<HttpResponse, Error> pub fn start<A, T>(actor: A, req: &HttpRequest, stream: T) -> Result<HttpResponse, Error>