From be4976b16edc35cd2fdd14a1121199dd688d0829 Mon Sep 17 00:00:00 2001 From: Douman Date: Thu, 31 May 2018 19:11:01 +0300 Subject: [PATCH] Re-export actix dependency. Closes #260 --- src/client/connector.rs | 3 +-- src/client/mod.rs | 2 -- src/client/request.rs | 1 - src/httpmessage.rs | 3 +-- src/lib.rs | 1 + src/middleware/identity.rs | 1 - src/middleware/session.rs | 3 +-- src/server/mod.rs | 3 +-- src/server/srv.rs | 4 +--- src/test.rs | 1 - src/ws/mod.rs | 3 +-- 11 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/client/connector.rs b/src/client/connector.rs index 65d4ded0d..acf838b75 100644 --- a/src/client/connector.rs +++ b/src/client/connector.rs @@ -285,7 +285,6 @@ impl ClientConnector { /// /// ```rust /// # #![cfg(feature="alpn")] - /// # extern crate actix; /// # extern crate actix_web; /// # extern crate futures; /// # extern crate tokio; @@ -293,7 +292,7 @@ impl ClientConnector { /// # use std::io::Write; /// # use std::process; /// extern crate openssl; - /// use actix::prelude::*; + /// use actix_web::actix::prelude::*; /// use actix_web::client::{Connect, ClientConnector}; /// /// use openssl::ssl::{SslMethod, SslConnector}; diff --git a/src/client/mod.rs b/src/client/mod.rs index 8aded0114..0e7befc3c 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -1,7 +1,6 @@ //! Http client api //! //! ```rust -//! # extern crate actix; //! # extern crate actix_web; //! # extern crate futures; //! # extern crate tokio; @@ -63,7 +62,6 @@ impl ResponseError for SendRequestError { /// /// /// ```rust -/// # extern crate actix; /// # extern crate actix_web; /// # extern crate futures; /// # extern crate tokio; diff --git a/src/client/request.rs b/src/client/request.rs index 97b97e01b..eebf8e007 100644 --- a/src/client/request.rs +++ b/src/client/request.rs @@ -25,7 +25,6 @@ use httprequest::HttpRequest; /// An HTTP Client Request /// /// ```rust -/// # extern crate actix; /// # extern crate actix_web; /// # extern crate futures; /// # extern crate tokio; diff --git a/src/httpmessage.rs b/src/httpmessage.rs index 2f23e6536..fe9a178de 100644 --- a/src/httpmessage.rs +++ b/src/httpmessage.rs @@ -224,13 +224,12 @@ pub trait HttpMessage { /// ## Server example /// /// ```rust - /// # extern crate actix; /// # extern crate actix_web; /// # extern crate env_logger; /// # extern crate futures; /// # use std::str; - /// # use actix::*; /// # use actix_web::*; + /// # use actix_web::actix::*; /// # use futures::{Future, Stream}; /// # use futures::future::{ok, result, Either}; /// fn index(mut req: HttpRequest) -> Box> { diff --git a/src/lib.rs b/src/lib.rs index a428b08bc..1ac22a433 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -194,6 +194,7 @@ pub use httprequest::HttpRequest; pub use httpresponse::HttpResponse; pub use json::Json; pub use scope::Scope; +pub use actix; #[doc(hidden)] #[deprecated(since = "0.6.2", note = "please use `use actix_web::ws::WsWriter`")] diff --git a/src/middleware/identity.rs b/src/middleware/identity.rs index 36317ebcf..54d97a1c8 100644 --- a/src/middleware/identity.rs +++ b/src/middleware/identity.rs @@ -143,7 +143,6 @@ pub trait IdentityPolicy: Sized + 'static { /// Request identity middleware /// /// ```rust -/// # extern crate actix; /// # extern crate actix_web; /// use actix_web::App; /// use actix_web::middleware::identity::{IdentityService, CookieIdentityPolicy}; diff --git a/src/middleware/session.rs b/src/middleware/session.rs index 57f42a117..ecaf6f1b6 100644 --- a/src/middleware/session.rs +++ b/src/middleware/session.rs @@ -32,10 +32,10 @@ //! session data. //! //! ```rust -//! # extern crate actix; //! # extern crate actix_web; //! use actix_web::{server, App, HttpRequest, Result}; //! use actix_web::middleware::session::{RequestSession, SessionStorage, CookieSessionBackend}; +//! use actix_web::actix; //! //! fn index(req: HttpRequest) -> Result<&'static str> { //! // access session data @@ -229,7 +229,6 @@ unsafe impl Sync for SessionImplCell {} /// Session storage middleware /// /// ```rust -/// # extern crate actix; /// # extern crate actix_web; /// use actix_web::App; /// use actix_web::middleware::session::{SessionStorage, CookieSessionBackend}; diff --git a/src/server/mod.rs b/src/server/mod.rs index 268764830..4af014655 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -42,9 +42,8 @@ pub(crate) const MAX_WRITE_BUFFER_SIZE: usize = 65_536; /// This is shortcut for `server::HttpServer::new()` method. /// /// ```rust -/// # extern crate actix; /// # extern crate actix_web; -/// use actix::*; +/// use actix_web::actix::*; /// use actix_web::{server, App, HttpResponse}; /// /// fn main() { diff --git a/src/server/srv.rs b/src/server/srv.rs index df6a4b9d4..cd5113f91 100644 --- a/src/server/srv.rs +++ b/src/server/srv.rs @@ -405,9 +405,8 @@ impl HttpServer { /// This method requires to run within properly configured `Actix` system. /// /// ```rust - /// extern crate actix; /// extern crate actix_web; - /// use actix_web::{server, App, HttpResponse}; + /// use actix_web::{actix, server, App, HttpResponse}; /// /// fn main() { /// // Run actix system, this method actually starts all async processes @@ -478,7 +477,6 @@ impl HttpServer { /// /// ```rust,ignore /// # extern crate futures; - /// # extern crate actix; /// # extern crate actix_web; /// # use futures::Future; /// use actix_web::*; diff --git a/src/test.rs b/src/test.rs index 558695ad7..b2f992ecf 100644 --- a/src/test.rs +++ b/src/test.rs @@ -40,7 +40,6 @@ use ws; /// # Examples /// /// ```rust -/// # extern crate actix; /// # extern crate actix_web; /// # use actix_web::*; /// # diff --git a/src/ws/mod.rs b/src/ws/mod.rs index 7f72dea1d..e54749d02 100644 --- a/src/ws/mod.rs +++ b/src/ws/mod.rs @@ -7,9 +7,8 @@ //! ## Example //! //! ```rust -//! # extern crate actix; //! # extern crate actix_web; -//! # use actix::*; +//! # use actix_web::actix::*; //! # use actix_web::*; //! use actix_web::{ws, HttpRequest, HttpResponse}; //!