Re-export actix dependency. Closes #260 (#264)

- Re-export actix's prelude into actix namespace
- Removing implicit dependency on root's actix module

src/ws/client.rs

@@ -1,4 +1,6 @@
 //! Http client request
+extern crate actix;
+
 use std::cell::UnsafeCell;
 use std::rc::Rc;
 use std::time::Duration;
@@ -14,7 +16,7 @@ use http::{Error as HttpError, HttpTryFrom, StatusCode};
 use rand;
 use sha1::Sha1;
 
-use actix::prelude::*;
+use self::actix::prelude::*;
 
 use body::Binary;
 use error::{Error, UrlParseError};

src/ws/context.rs

@@ -1,10 +1,12 @@
+extern crate actix;
+
 use futures::sync::oneshot::{self, Sender};
 use futures::{Async, Poll};
 use smallvec::SmallVec;
 
-use actix::dev::{ContextImpl, Envelope, ToEnvelope};
-use actix::fut::ActorFuture;
-use actix::{
+use self::actix::dev::{ContextImpl, Envelope, ToEnvelope};
+use self::actix::fut::ActorFuture;
+use self::actix::{
     Actor, ActorContext, ActorState, Addr, AsyncContext, Handler, Message, SpawnHandle,
 };
 

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};
 //!
@@ -43,11 +42,13 @@
 //! #      .finish();
 //! # }
 //! ```
+extern crate actix;
+
 use bytes::Bytes;
 use futures::{Async, Poll, Stream};
 use http::{header, Method, StatusCode};
 
-use actix::{Actor, AsyncContext, StreamHandler};
+use self::actix::{Actor, AsyncContext, StreamHandler};
 
 use body::Binary;
 use error::{Error, PayloadError, ResponseError};