actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-27 17:22:57 +01:00
Code Issues Releases Wiki Activity

Remove unneeded actix-utils dependency

Browse Source
This commit is contained in:
Nikolay Kim 2019-07-20 10:50:36 +06:00
parent f8320fedd8
commit 941241c5f0
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actix-framed/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-framed" name = "actix-framed"
version = "0.2.0" version = "0.2.1"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix framed app server" description = "Actix framed app server"
readme = "README.md" readme = "README.md"
@ -21,11 +21,10 @@ path = "src/lib.rs"
[dependencies] [dependencies]
actix-codec = "0.1.2" actix-codec = "0.1.2"
actix-service = "0.4.0" actix-service = "0.4.1"
actix-utils = "0.4.0"
actix-router = "0.1.2" actix-router = "0.1.2"
actix-rt = "0.2.2" actix-rt = "0.2.2"
actix-http = "0.2.0" actix-http = "0.2.7"
actix-server-config = "0.1.2" actix-server-config = "0.1.2"
bytes = "0.4" bytes = "0.4"
@ -36,3 +35,4 @@ log = "0.4"
actix-server = { version = "0.6.0", features=["ssl"] } actix-server = { version = "0.6.0", features=["ssl"] }
actix-connect = { version = "0.2.0", features=["ssl"] } actix-connect = { version = "0.2.0", features=["ssl"] }
actix-http-test = { version = "0.2.4", features=["ssl"] } actix-http-test = { version = "0.2.4", features=["ssl"] }
actix-utils = "0.4.4"

5
actix-framed/changes.md
View File

@ -1,5 +1,10 @@
# Changes # Changes
## [0.2.1] - 2019-07-20
* Remove unneeded actix-utils dependency
## [0.2.0] - 2019-05-12 ## [0.2.0] - 2019-05-12
* Update dependencies * Update dependencies

9
actix-framed/src/app.rs
View File

@ -6,7 +6,6 @@ use actix_http::{Error, Request, Response};
use actix_router::{Path, Router, Url}; use actix_router::{Path, Router, Url};
use actix_server_config::ServerConfig; use actix_server_config::ServerConfig;
use actix_service::{IntoNewService, NewService, Service}; use actix_service::{IntoNewService, NewService, Service};
use actix_utils::cloneable::CloneableService;
use futures::{Async, Future, Poll}; use futures::{Async, Future, Poll};
use crate::helpers::{BoxedHttpNewService, BoxedHttpService, HttpNewService}; use crate::helpers::{BoxedHttpNewService, BoxedHttpService, HttpNewService};
@ -100,7 +99,7 @@ where
type Response = (); type Response = ();
type Error = Error; type Error = Error;
type InitError = (); type InitError = ();
type Service = CloneableService<FramedAppService<T, S>>; type Service = FramedAppService<T, S>;
type Future = CreateService<T, S>; type Future = CreateService<T, S>;
fn new_service(&self, _: &ServerConfig) -> Self::Future { fn new_service(&self, _: &ServerConfig) -> Self::Future {
@ -138,7 +137,7 @@ impl<S: 'static, T: 'static> Future for CreateService<T, S>
where where
T: AsyncRead + AsyncWrite, T: AsyncRead + AsyncWrite,
{ {
type Item = CloneableService<FramedAppService<T, S>>; type Item = FramedAppService<T, S>;
type Error = (); type Error = ();
fn poll(&mut self) -> Poll<Self::Item, Self::Error> { fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
@ -177,10 +176,10 @@ where
} }
router router
}); });
Ok(Async::Ready(CloneableService::new(FramedAppService { Ok(Async::Ready(FramedAppService {
router: router.finish(), router: router.finish(),
state: self.state.clone(), state: self.state.clone(),
}))) }))
} else { } else {
Ok(Async::NotReady) Ok(Async::NotReady)
} }

7
actix-framed/src/lib.rs
View File

@ -1,9 +1,4 @@
#![allow( #![allow(clippy::type_complexity, clippy::new_without_default, dead_code)]
clippy::type_complexity,
clippy::new_without_default,
dead_code,
deprecated
)]
mod app; mod app;
mod helpers; mod helpers;
mod request; mod request;

2
src/guard.rs
View File

@ -26,7 +26,7 @@
//! ``` //! ```
#![allow(non_snake_case)] #![allow(non_snake_case)]
use actix_http::http::{self, header, HttpTryFrom, uri::Uri}; use actix_http::http::{self, header, uri::Uri, HttpTryFrom};
use actix_http::RequestHead; use actix_http::RequestHead;
/// Trait defines resource guards. Guards are used for routes selection. /// Trait defines resource guards. Guards are used for routes selection.