Merge branch 'master' into patch-1

.travis.yml

@@ -57,6 +57,7 @@ script:
       cd examples/hello-world && cargo check && cd ../..
       cd examples/multipart && cargo check && cd ../..
       cd examples/json && cargo check && cd ../..
+      cd examples/state && cargo check && cd ../..
       cd examples/template_tera && cargo check && cd ../..
       cd examples/diesel && cargo check && cd ../..
       cd examples/tls && cargo check && cd ../..

Cargo.toml

@@ -78,7 +78,7 @@ openssl = { version="0.10", optional = true }
 tokio-openssl = { version="0.2", optional = true }
 
 [dependencies.actix]
-#version = "^0.4.6"
+#version = "0.5"
 git = "https://github.com/actix/actix.git"
 
 [dev-dependencies]

examples/diesel/src/db.rs

@@ -17,9 +17,8 @@ pub struct CreateUser {
     pub name: String,
 }
 
-impl ResponseType for CreateUser {
+impl Message for CreateUser {
-    type Item = models::User;
+    type Result = Result<models::User, Error>;
-    type Error = Error;
 }
 
 impl Actor for DbExecutor {
@@ -27,7 +26,7 @@ impl Actor for DbExecutor {
 }
 
 impl Handler<CreateUser> for DbExecutor {
-    type Result = MessageResult<CreateUser>;
+    type Result = Result<models::User, Error>;
 
     fn handle(&mut self, msg: CreateUser, _: &mut Self::Context) -> Self::Result {
         use self::schema::users::dsl::*;

examples/diesel/src/main.rs

@@ -31,14 +31,14 @@ use db::{CreateUser, DbExecutor};
 
 /// State with DbExecutor address
 struct State {
-    db: SyncAddress<DbExecutor>,
+    db: Addr<Syn, DbExecutor>,
 }
 
 /// Async request handler
 fn index(req: HttpRequest<State>) -> Box<Future<Item=HttpResponse, Error=Error>> {
     let name = &req.match_info()["name"];
 
-    req.state().db.call_fut(CreateUser{name: name.to_owned()})
+    req.state().db.send(CreateUser{name: name.to_owned()})
         .from_err()
         .and_then(|res| {
             match res {

examples/state/src/main.rs

@@ -44,7 +44,7 @@ impl Handler<ws::Message> for MyWebSocket {
         println!("WS({}): {:?}", self.counter, msg);
         match msg {
             ws::Message::Ping(msg) => ctx.pong(&msg),
-            ws::Message::Text(text) => ctx.text(&text),
+            ws::Message::Text(text) => ctx.text(text),
             ws::Message::Binary(bin) => ctx.binary(bin),
             ws::Message::Closed | ws::Message::Error => {
                 ctx.stop();

examples/websocket-chat/src/client.rs

@@ -29,7 +29,7 @@ fn main() {
     Arbiter::handle().spawn(
         TcpStream::connect(&addr, Arbiter::handle())
             .and_then(|stream| {
-                let addr: SyncAddress<_> = ChatClient::create(|ctx| {
+                let addr: Addr<Syn, _> = ChatClient::create(|ctx| {
                     let (r, w) = stream.split();
                     ChatClient::add_stream(FramedRead::new(r, codec::ClientChatCodec), ctx);
                     ChatClient{
@@ -45,7 +45,7 @@ fn main() {
                             return
                         }
 
-                        addr.send(ClientCommand(cmd));
+                        addr.do_send(ClientCommand(cmd));
                     }
                 });
 
@@ -81,7 +81,7 @@ impl Actor for ChatClient {
         println!("Disconnected");
 
         // Stop application on disconnect
-        Arbiter::system().send(actix::msgs::SystemExit(0));
+        Arbiter::system().do_send(actix::msgs::SystemExit(0));
 
         true
     }

examples/websocket-chat/src/codec.rs

@@ -4,10 +4,9 @@ use serde_json as json;
 use byteorder::{BigEndian , ByteOrder};
 use bytes::{BytesMut, BufMut};
 use tokio_io::codec::{Encoder, Decoder};
-use actix::ResponseType;
 
 /// Client request
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Message)]
 #[serde(tag="cmd", content="data")]
 pub enum ChatRequest {
     /// List rooms
@@ -20,13 +19,8 @@ pub enum ChatRequest {
     Ping
 }
 
-impl ResponseType for ChatRequest {
-    type Item = ();
-    type Error = ();
-}
-
 /// Server response
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Message)]
 #[serde(tag="cmd", content="data")]
 pub enum ChatResponse {
     Ping,
@@ -41,11 +35,6 @@ pub enum ChatResponse {
     Message(String),
 }
 
-impl ResponseType for ChatResponse {
-    type Item = ();
-    type Error = ();
-}
-
 /// Codec for Client -> Server transport
 pub struct ChatCodec;
 

examples/websocket-chat/src/main.rs

@@ -26,7 +26,7 @@ mod session;
 /// This is our websocket route state, this state is shared with all route instances
 /// via `HttpContext::state()`
 struct WsChatSessionState {
-    addr: SyncAddress<server::ChatServer>,
+    addr: Addr<Syn, server::ChatServer>,
 }
 
 /// Entry point for our route
@@ -62,12 +62,12 @@ impl Actor for WsChatSession {
         // before processing any other events.
         // HttpContext::state() is instance of WsChatSessionState, state is shared across all
         // routes within application
-        let addr: SyncAddress<_> = ctx.address();
+        let addr: Addr<Syn, _> = ctx.address();
-        ctx.state().addr.call(
+        ctx.state().addr.send(server::Connect{addr: addr.recipient()})
-            self, server::Connect{addr: addr.into()}).then(
+            .into_actor(self)
-            |res, act, ctx| {
+            .then(|res, act, ctx| {
                 match res {
-                    Ok(Ok(res)) => act.id = res,
+                    Ok(res) => act.id = res,
                     // something is wrong with chat server
                     _ => ctx.stop(),
                 }
@@ -77,7 +77,7 @@ impl Actor for WsChatSession {
 
     fn stopping(&mut self, ctx: &mut Self::Context) -> bool {
         // notify chat server
-        ctx.state().addr.send(server::Disconnect{id: self.id});
+        ctx.state().addr.do_send(server::Disconnect{id: self.id});
         true
     }
 }
@@ -109,9 +109,11 @@ impl Handler<ws::Message> for WsChatSession {
                         "/list" => {
                             // Send ListRooms message to chat server and wait for response
                             println!("List rooms");
-                            ctx.state().addr.call(self, server::ListRooms).then(|res, _, ctx| {
+                            ctx.state().addr.send(server::ListRooms)
+                                .into_actor(self)
+                                .then(|res, _, ctx| {
                                     match res {
-                                    Ok(Ok(rooms)) => {
+                                        Ok(rooms) => {
                                             for room in rooms {
                                                 ctx.text(room);
                                             }
@@ -127,7 +129,7 @@ impl Handler<ws::Message> for WsChatSession {
                         "/join" => {
                             if v.len() == 2 {
                                 self.room = v[1].to_owned();
-                                ctx.state().addr.send(
+                                ctx.state().addr.do_send(
                                     server::Join{id: self.id, name: self.room.clone()});
 
                                 ctx.text("joined");
@@ -151,7 +153,7 @@ impl Handler<ws::Message> for WsChatSession {
                         m.to_owned()
                     };
                     // send message to chat server
-                    ctx.state().addr.send(
+                    ctx.state().addr.do_send(
                         server::Message{id: self.id,
                                         msg: msg,
                                         room: self.room.clone()})
@@ -172,12 +174,11 @@ fn main() {
     let sys = actix::System::new("websocket-example");
 
     // Start chat server actor in separate thread
-    let server: SyncAddress<_> =
+    let server: Addr<Syn, _> = Arbiter::start(|_| server::ChatServer::default());
-        Arbiter::start(|_| server::ChatServer::default());
 
     // Start tcp server in separate thread
     let srv = server.clone();
-    Arbiter::new("tcp-server").send::<msgs::Execute>(
+    Arbiter::new("tcp-server").do_send::<msgs::Execute>(
         msgs::Execute::new(move || {
             session::TcpServer::new("127.0.0.1:12345", srv);
             Ok(())

examples/websocket-chat/src/server.rs

@@ -12,16 +12,10 @@ use session;
 /// Message for chat server communications
 
 /// New chat session is created
+#[derive(Message)]
+#[rtype(usize)]
 pub struct Connect {
-    pub addr: SyncSubscriber<session::Message>,
+    pub addr: Recipient<Syn, session::Message>,
-}
-
-/// Response type for Connect message
-///
-/// Chat server returns unique session id
-impl ResponseType for Connect  {
-    type Item = usize;
-    type Error = ();
 }
 
 /// Session is disconnected
@@ -44,9 +38,8 @@ pub struct Message {
 /// List of available rooms
 pub struct ListRooms;
 
-impl ResponseType for ListRooms {
+impl actix::Message for ListRooms {
-    type Item = Vec<String>;
+    type Result = Vec<String>;
-    type Error = ();
 }
 
 /// Join room, if room does not exists create new one.
@@ -61,7 +54,7 @@ pub struct Join {
 /// `ChatServer` manages chat rooms and responsible for coordinating chat session.
 /// implementation is super primitive
 pub struct ChatServer {
-    sessions: HashMap<usize, SyncSubscriber<session::Message>>,
+    sessions: HashMap<usize, Recipient<Syn, session::Message>>,
     rooms: HashMap<String, HashSet<usize>>,
     rng: RefCell<ThreadRng>,
 }
@@ -87,7 +80,7 @@ impl ChatServer {
             for id in sessions {
                 if *id != skip_id {
                     if let Some(addr) = self.sessions.get(id) {
-                        let _ = addr.send(session::Message(message.to_owned()));
+                        let _ = addr.do_send(session::Message(message.to_owned()));
                     }
                 }
             }
@@ -106,7 +99,7 @@ impl Actor for ChatServer {
 ///
 /// Register new session and assign unique id to this session
 impl Handler<Connect> for ChatServer {
-    type Result = MessageResult<Connect>;
+    type Result = usize;
 
     fn handle(&mut self, msg: Connect, _: &mut Context<Self>) -> Self::Result {
         println!("Someone joined");
@@ -122,7 +115,7 @@ impl Handler<Connect> for ChatServer {
         self.rooms.get_mut(&"Main".to_owned()).unwrap().insert(id);
 
         // send id back
-        Ok(id)
+        id
     }
 }
 
@@ -171,7 +164,7 @@ impl Handler<ListRooms> for ChatServer {
             rooms.push(key.to_owned())
         }
 
-        Ok(rooms)
+        MessageResult(rooms)
     }
 }
 

examples/websocket-chat/src/session.rs

@@ -24,7 +24,7 @@ pub struct ChatSession {
     /// unique session id
     id: usize,
     /// this is address of chat server
-    addr: SyncAddress<ChatServer>,
+    addr: Addr<Syn, ChatServer>,
     /// Client must send ping at least once per 10 seconds, otherwise we drop connection.
     hb: Instant,
     /// joined room
@@ -45,11 +45,12 @@ impl Actor for ChatSession {
         // register self in chat server. `AsyncContext::wait` register
         // future within context, but context waits until this future resolves
         // before processing any other events.
-        let addr: SyncAddress<_> = ctx.address();
+        let addr: Addr<Syn, _> = ctx.address();
-        self.addr.call(self, server::Connect{addr: addr.into()})
+        self.addr.send(server::Connect{addr: addr.recipient()})
+            .into_actor(self)
             .then(|res, act, ctx| {
                 match res {
-                    Ok(Ok(res)) => act.id = res,
+                    Ok(res) => act.id = res,
                     // something is wrong with chat server
                     _ => ctx.stop(),
                 }
@@ -59,7 +60,7 @@ impl Actor for ChatSession {
 
     fn stopping(&mut self, ctx: &mut Self::Context) -> bool {
         // notify chat server
-        self.addr.send(server::Disconnect{id: self.id});
+        self.addr.do_send(server::Disconnect{id: self.id});
         true
     }
 }
@@ -75,9 +76,11 @@ impl StreamHandler<ChatRequest, io::Error> for ChatSession {
             ChatRequest::List => {
                 // Send ListRooms message to chat server and wait for response
                 println!("List rooms");
-                self.addr.call(self, server::ListRooms).then(|res, act, ctx| {
+                self.addr.send(server::ListRooms)
+                    .into_actor(self)
+                    .then(|res, act, ctx| {
                         match res {
-                        Ok(Ok(rooms)) => {
+                            Ok(rooms) => {
                                 act.framed.write(ChatResponse::Rooms(rooms));
                             },
                             _ => println!("Something is wrong"),
@@ -90,13 +93,13 @@ impl StreamHandler<ChatRequest, io::Error> for ChatSession {
             ChatRequest::Join(name) => {
                 println!("Join to room: {}", name);
                 self.room = name.clone();
-                self.addr.send(server::Join{id: self.id, name: name.clone()});
+                self.addr.do_send(server::Join{id: self.id, name: name.clone()});
                 self.framed.write(ChatResponse::Joined(name));
             },
             ChatRequest::Message(message) => {
                 // send message to chat server
                 println!("Peer message: {}", message);
-                self.addr.send(
+                self.addr.do_send(
                     server::Message{id: self.id,
                                     msg: message, room:
                                     self.room.clone()})
@@ -121,7 +124,7 @@ impl Handler<Message> for ChatSession {
 /// Helper methods
 impl ChatSession {
 
-    pub fn new(addr: SyncAddress<ChatServer>,
+    pub fn new(addr: Addr<Syn,ChatServer>,
                framed: actix::io::FramedWrite<WriteHalf<TcpStream>, ChatCodec>) -> ChatSession {
         ChatSession {id: 0, addr: addr, hb: Instant::now(),
                      room: "Main".to_owned(), framed: framed}
@@ -138,7 +141,7 @@ impl ChatSession {
                 println!("Client heartbeat failed, disconnecting!");
 
                 // notify chat server
-                act.addr.send(server::Disconnect{id: act.id});
+                act.addr.do_send(server::Disconnect{id: act.id});
 
                 // stop actor
                 ctx.stop();
@@ -155,11 +158,11 @@ impl ChatSession {
 /// Define tcp server that will accept incoming tcp connection and create
 /// chat actors.
 pub struct TcpServer {
-    chat: SyncAddress<ChatServer>,
+    chat: Addr<Syn, ChatServer>,
 }
 
 impl TcpServer {
-    pub fn new(s: &str, chat: SyncAddress<ChatServer>) {
+    pub fn new(s: &str, chat: Addr<Syn, ChatServer>) {
         // Create server listener
         let addr = net::SocketAddr::from_str("127.0.0.1:12345").unwrap();
         let listener = TcpListener::bind(&addr, Arbiter::handle()).unwrap();

examples/websocket/src/client.rs

@@ -28,7 +28,7 @@ fn main() {
                 ()
             })
             .map(|(reader, writer)| {
-                let addr: SyncAddress<_> = ChatClient::create(|ctx| {
+                let addr: Addr<Syn, _> = ChatClient::create(|ctx| {
                     ChatClient::add_stream(reader, ctx);
                     ChatClient(writer)
                 });
@@ -41,7 +41,7 @@ fn main() {
                             println!("error");
                             return
                         }
-                        addr.send(ClientCommand(cmd));
+                        addr.do_send(ClientCommand(cmd));
                     }
                 });
 
@@ -70,7 +70,7 @@ impl Actor for ChatClient {
         println!("Stopping");
 
         // Stop application on disconnect
-        Arbiter::system().send(actix::msgs::SystemExit(0));
+        Arbiter::system().do_send(actix::msgs::SystemExit(0));
 
         true
     }

guide/src/qs_10.md

@@ -200,7 +200,7 @@ fn main() {
             )))
         .bind("127.0.0.1:59880").unwrap()
         .start();
-#     actix::Arbiter::system().send(actix::msgs::SystemExit(0));
+#     actix::Arbiter::system().do_send(actix::msgs::SystemExit(0));
 #     let _ = sys.run();
 }
 ```

guide/src/qs_3_5.md

@@ -24,7 +24,7 @@ fn main() {
         .bind("127.0.0.1:59080").unwrap()
         .start();
 
-#     actix::Arbiter::system().send(actix::msgs::SystemExit(0));
+#     actix::Arbiter::system().do_send(actix::msgs::SystemExit(0));
     let _ = sys.run();
 }
 ```
@@ -66,7 +66,7 @@ fn main() {
     });
 
     let addr = rx.recv().unwrap();
-    let _ = addr.call_fut(
+    let _ = addr.send(
          server::StopServer{graceful:true}).wait(); // <- Send `StopServer` message to server.
 }
 ```

guide/src/qs_4.md

@@ -89,8 +89,7 @@ impl<S> Handler<S> for MyHandler {
 
     /// Handle request
     fn handle(&mut self, req: HttpRequest<S>) -> Self::Result {
-        let num = self.0.load(Ordering::Relaxed) + 1;
+        self.0.fetch_add(1, Ordering::Relaxed);
-        self.0.store(num, Ordering::Relaxed);
         httpcodes::HTTPOk.into()
     }
 }
@@ -110,7 +109,7 @@ fn main() {
         .start();
 
     println!("Started http server: 127.0.0.1:8088");
-#    actix::Arbiter::system().send(actix::msgs::SystemExit(0));
+#    actix::Arbiter::system().do_send(actix::msgs::SystemExit(0));
     let _ = sys.run();
 }
 ```
@@ -168,7 +167,7 @@ fn main() {
         .start();
 
     println!("Started http server: 127.0.0.1:8088");
-#    actix::Arbiter::system().send(actix::msgs::SystemExit(0));
+#    actix::Arbiter::system().do_send(actix::msgs::SystemExit(0));
     let _ = sys.run();
 }
 ```

src/client/connector.rs

@@ -5,7 +5,7 @@ use std::collections::VecDeque;
 use std::time::Duration;
 
 use actix::{fut, Actor, ActorFuture, Arbiter, Context,
-            Handler, Response, ResponseType, Supervised};
+            Handler, Message, ActorResponse, Supervised};
 use actix::registry::ArbiterService;
 use actix::fut::WrapFuture;
 use actix::actors::{Connector, ConnectorError, Connect as ResolveConnect};
@@ -37,9 +37,8 @@ impl Connect {
     }
 }
 
-impl ResponseType for Connect {
+impl Message for Connect {
-    type Item = Connection;
+    type Result = Result<Connection, ClientConnectorError>;
-    type Error = ClientConnectorError;
 }
 
 /// A set of errors that can occur during connecting to a http host
@@ -140,14 +139,14 @@ impl ClientConnector {
     ///     let conn: Address<_> = ClientConnector::with_connector(ssl_conn).start();
     ///
     ///     Arbiter::handle().spawn({
-    ///         conn.call_fut(
+    ///         conn.send(
     ///             Connect::new("https://www.rust-lang.org").unwrap()) // <- connect to host
     ///                 .map_err(|_| ())
     ///                 .and_then(|res| {
     ///                     if let Ok(mut stream) = res {
     ///                         stream.write_all(b"GET / HTTP/1.0\r\n\r\n").unwrap();
     ///                     }
-    /// #                   Arbiter::system().send(actix::msgs::SystemExit(0));
+    /// #                   Arbiter::system().do_send(actix::msgs::SystemExit(0));
     ///                     Ok(())
     ///                 })
     ///     });
@@ -163,36 +162,37 @@ impl ClientConnector {
 }
 
 impl Handler<Connect> for ClientConnector {
-    type Result = Response<ClientConnector, Connect>;
+    type Result = ActorResponse<ClientConnector, Connection, ClientConnectorError>;
 
     fn handle(&mut self, msg: Connect, _: &mut Self::Context) -> Self::Result {
         let uri = &msg.0;
 
         // host name is required
         if uri.host().is_none() {
-            return Response::reply(Err(ClientConnectorError::InvalidUrl))
+            return ActorResponse::reply(Err(ClientConnectorError::InvalidUrl))
         }
 
         // supported protocols
         let proto = match uri.scheme_part() {
             Some(scheme) => match Protocol::from(scheme.as_str()) {
                 Some(proto) => proto,
-                None => return Response::reply(Err(ClientConnectorError::InvalidUrl)),
+                None => return ActorResponse::reply(Err(ClientConnectorError::InvalidUrl)),
             },
-            None => return Response::reply(Err(ClientConnectorError::InvalidUrl)),
+            None => return ActorResponse::reply(Err(ClientConnectorError::InvalidUrl)),
         };
 
         // check ssl availability
         if proto.is_secure() && !HAS_OPENSSL { //&& !HAS_TLS {
-            return Response::reply(Err(ClientConnectorError::SslIsNotSupported))
+            return ActorResponse::reply(Err(ClientConnectorError::SslIsNotSupported))
         }
 
         let host = uri.host().unwrap().to_owned();
         let port = uri.port().unwrap_or_else(|| proto.port());
 
-        Response::async_reply(
+        ActorResponse::async(
             Connector::from_registry()
-                .call(self, ResolveConnect::host_and_port(&host, port))
+                .send(ResolveConnect::host_and_port(&host, port))
+                .into_actor(self)
                 .map_err(|_, _, _| ClientConnectorError::Disconnected)
                 .and_then(move |res, _act, _| {
                     #[cfg(feature="alpn")]

src/context.rs

@@ -1,4 +1,4 @@
-use std;
+use std::mem;
 use std::marker::PhantomData;
 use futures::{Async, Future, Poll};
 use futures::sync::oneshot::Sender;
@@ -6,9 +6,9 @@ use futures::unsync::oneshot;
 use smallvec::SmallVec;
 
 use actix::{Actor, ActorState, ActorContext, AsyncContext,
-            Addr, Handler, ResponseType, MessageResult, SpawnHandle, Syn, Unsync};
+            Addr, Handler, Message, SpawnHandle, Syn, Unsync};
 use actix::fut::ActorFuture;
-use actix::dev::{ContextImpl, ToEnvelope, RemoteEnvelope};
+use actix::dev::{ContextImpl, ToEnvelope, SyncEnvelope};
 
 use body::{Body, Binary};
 use error::{Error, ErrorInternalServerError};
@@ -83,12 +83,12 @@ impl<A, S> AsyncContext<A> for HttpContext<A, S> where A: Actor<Context=Self>
     }
     #[doc(hidden)]
     #[inline]
-    fn unsync_address(&mut self) -> Addr<Unsync<A>> {
+    fn unsync_address(&mut self) -> Addr<Unsync, A> {
         self.inner.unsync_address()
     }
     #[doc(hidden)]
     #[inline]
-    fn sync_address(&mut self) -> Addr<Syn<A>> {
+    fn sync_address(&mut self) -> Addr<Syn, A> {
         self.inner.sync_address()
     }
 }
@@ -184,7 +184,7 @@ impl<A, S> ActorHttpContext for HttpContext<A, S> where A: Actor<Context=Self>,
 
     fn poll(&mut self) -> Poll<Option<SmallVec<[Frame; 4]>>, Error> {
         let ctx: &mut HttpContext<A, S> = unsafe {
-            std::mem::transmute(self as &mut HttpContext<A, S>)
+            mem::transmute(self as &mut HttpContext<A, S>)
         };
 
         if self.inner.alive() {
@@ -205,12 +205,12 @@ impl<A, S> ActorHttpContext for HttpContext<A, S> where A: Actor<Context=Self>,
     }
 }
 
-impl<A, M, S> ToEnvelope<Syn<A>, M> for HttpContext<A, S>
+impl<A, M, S> ToEnvelope<Syn, A, M> for HttpContext<A, S>
     where A: Actor<Context=HttpContext<A, S>> + Handler<M>,
-          M: ResponseType + Send + 'static, M::Item: Send, M::Error: Send,
+          M: Message + Send + 'static, M::Result: Send,
 {
-    fn pack(msg: M, tx: Option<Sender<MessageResult<M>>>) -> Syn<A> {
+    fn pack(msg: M, tx: Option<Sender<M::Result>>) -> SyncEnvelope<A> {
-        Syn::new(Box::new(RemoteEnvelope::envelope(msg, tx)))
+        SyncEnvelope::new(msg, tx)
     }
 }
 

src/error.rs

@@ -403,8 +403,8 @@ pub enum UrlencodedError {
     #[fail(display="Content type error")]
     ContentType,
     /// Payload error
-    #[fail(display="Error that occur during reading payload")]
+    #[fail(display="Error that occur during reading payload: {}", _0)]
-    Payload(PayloadError),
+    Payload(#[cause] PayloadError),
 }
 
 /// Return `BadRequest` for `UrlencodedError`
@@ -435,11 +435,11 @@ pub enum JsonPayloadError {
     #[fail(display="Content type error")]
     ContentType,
     /// Deserialize error
-    #[fail(display="Json deserialize error")]
+    #[fail(display="Json deserialize error: {}", _0)]
-    Deserialize(JsonError),
+    Deserialize(#[cause] JsonError),
     /// Payload error
-    #[fail(display="Error that occur during reading payload")]
+    #[fail(display="Error that occur during reading payload: {}", _0)]
-    Payload(PayloadError),
+    Payload(#[cause] PayloadError),
 }
 
 /// Return `BadRequest` for `UrlencodedError`

src/pipeline.rs

@@ -739,7 +739,7 @@ mod tests {
 
             let req = HttpRequest::default();
             let mut ctx = HttpContext::new(req.clone(), MyActor);
-            let addr: Addr<Unsync<_>> = ctx.address();
+            let addr: Addr<Unsync, _> = ctx.address();
             let mut info = PipelineInfo::new(req);
             info.context = Some(Box::new(ctx));
             let mut state = Completed::<(), Inner<()>>::init(&mut info).completed().unwrap();

src/server/mod.rs

@@ -2,6 +2,7 @@
 use std::{time, io};
 use std::net::Shutdown;
 
+use actix;
 use futures::Poll;
 use tokio_io::{AsyncRead, AsyncWrite};
 use tokio_core::net::TcpStream;
@@ -43,11 +44,14 @@ pub struct ResumeServer;
 /// Stop incoming connection processing, stop all workers and exit.
 ///
 /// If server starts with `spawn()` method, then spawned thread get terminated.
-#[derive(Message)]
 pub struct StopServer {
     pub graceful: bool
 }
 
+impl actix::Message for StopServer {
+    type Result = Result<(), ()>;
+}
+
 /// Low level http request handler
 #[allow(unused_variables)]
 pub trait HttpHandler: 'static {

src/server/srv.rs

@@ -36,12 +36,12 @@ pub struct HttpServer<H> where H: IntoHttpHandler + 'static
     host: Option<String>,
     keep_alive: Option<u64>,
     factory: Arc<Fn() -> Vec<H> + Send + Sync>,
-    workers: Vec<Addr<Syn<Worker<H::Handler>>>>,
+    workers: Vec<Addr<Syn, Worker<H::Handler>>>,
     sockets: HashMap<net::SocketAddr, net::TcpListener>,
     accept: Vec<(mio::SetReadiness, sync_mpsc::Sender<Command>)>,
     exit: bool,
     shutdown_timeout: u16,
-    signals: Option<Addr<Syn<signal::ProcessSignals>>>,
+    signals: Option<Addr<Syn, signal::ProcessSignals>>,
     no_signals: bool,
 }
 
@@ -146,7 +146,7 @@ impl<H> HttpServer<H> where H: IntoHttpHandler + 'static
     }
 
     /// Set alternative address for `ProcessSignals` actor.
-    pub fn signals(mut self, addr: Addr<Syn<signal::ProcessSignals>>) -> Self {
+    pub fn signals(mut self, addr: Addr<Syn, signal::ProcessSignals>) -> Self {
         self.signals = Some(addr);
         self
     }
@@ -227,7 +227,7 @@ impl<H> HttpServer<H> where H: IntoHttpHandler + 'static
     }
 
     // subscribe to os signals
-    fn subscribe_to_signals(&self) -> Option<Addr<Syn<signal::ProcessSignals>>> {
+    fn subscribe_to_signals(&self) -> Option<Addr<Syn, signal::ProcessSignals>> {
         if !self.no_signals {
             if let Some(ref signals) = self.signals {
                 Some(signals.clone())
@@ -264,12 +264,12 @@ impl<H: IntoHttpHandler> HttpServer<H>
     ///              .resource("/", |r| r.h(httpcodes::HTTPOk)))
     ///         .bind("127.0.0.1:0").expect("Can not bind to 127.0.0.1:0")
     ///         .start();
-    /// #  actix::Arbiter::system().send(actix::msgs::SystemExit(0));
+    /// #  actix::Arbiter::system().do_send(actix::msgs::SystemExit(0));
     ///
     ///    let _ = sys.run();  // <- Run actix system, this method actually starts all async processes
     /// }
     /// ```
-    pub fn start(mut self) -> Addr<Syn<Self>>
+    pub fn start(mut self) -> Addr<Syn, Self>
     {
         if self.sockets.is_empty() {
             panic!("HttpServer::bind() has to be called before start()");
@@ -288,9 +288,9 @@ impl<H: IntoHttpHandler> HttpServer<H>
 
             // start http server actor
             let signals = self.subscribe_to_signals();
-            let addr: Addr<Syn<_>> = Actor::start(self);
+            let addr: Addr<Syn, _> = Actor::start(self);
-            signals.map(|signals| signals.send(
+            signals.map(|signals| signals.do_send(
-                signal::Subscribe(addr.clone().subscriber())));
+                signal::Subscribe(addr.clone().recipient())));
             addr
         }
     }
@@ -333,7 +333,7 @@ impl<H: IntoHttpHandler> HttpServer<H>
 impl<H: IntoHttpHandler> HttpServer<H>
 {
     /// Start listening for incoming tls connections.
-    pub fn start_tls(mut self, acceptor: TlsAcceptor) -> io::Result<SyncAddress<Self>> {
+    pub fn start_tls(mut self, acceptor: TlsAcceptor) -> io::Result<Addr<Syn, Self>> {
         if self.sockets.is_empty() {
             Err(io::Error::new(io::ErrorKind::Other, "No socket addresses are bound"))
         } else {
@@ -350,9 +350,9 @@ impl<H: IntoHttpHandler> HttpServer<H>
 
             // start http server actor
             let signals = self.subscribe_to_signals();
-            let addr: SyncAddress<_> = Actor::start(self);
+            let addr: Addr<Syn, _> = Actor::start(self);
-            signals.map(|signals| signals.send(
+            signals.map(|signals| signals.do_send(
-                signal::Subscribe(addr.clone().into())));
+                signal::Subscribe(addr.clone().recipient())));
             Ok(addr)
         }
     }
@@ -364,7 +364,7 @@ impl<H: IntoHttpHandler> HttpServer<H>
     /// Start listening for incoming tls connections.
     ///
     /// This method sets alpn protocols to "h2" and "http/1.1"
-    pub fn start_ssl(mut self, mut builder: SslAcceptorBuilder) -> io::Result<SyncAddress<Self>>
+    pub fn start_ssl(mut self, mut builder: SslAcceptorBuilder) -> io::Result<Addr<Syn, Self>>
     {
         if self.sockets.is_empty() {
             Err(io::Error::new(io::ErrorKind::Other, "No socket addresses are bound"))
@@ -394,9 +394,9 @@ impl<H: IntoHttpHandler> HttpServer<H>
 
             // start http server actor
             let signals = self.subscribe_to_signals();
-            let addr: SyncAddress<_> = Actor::start(self);
+            let addr: Addr<Syn, _> = Actor::start(self);
-            signals.map(|signals| signals.send(
+            signals.map(|signals| signals.do_send(
-                signal::Subscribe(addr.clone().into())));
+                signal::Subscribe(addr.clone().recipient())));
             Ok(addr)
         }
     }
@@ -407,7 +407,7 @@ impl<H: IntoHttpHandler> HttpServer<H>
     /// Start listening for incoming connections from a stream.
     ///
     /// This method uses only one thread for handling incoming connections.
-    pub fn start_incoming<T, A, S>(mut self, stream: S, secure: bool) -> Addr<Syn<Self>>
+    pub fn start_incoming<T, A, S>(mut self, stream: S, secure: bool) -> Addr<Syn, Self>
         where S: Stream<Item=(T, A), Error=io::Error> + 'static,
               T: AsyncRead + AsyncWrite + 'static,
               A: 'static
@@ -435,15 +435,15 @@ impl<H: IntoHttpHandler> HttpServer<H>
 
         // start server
         let signals = self.subscribe_to_signals();
-        let addr: Addr<Syn<_>> = HttpServer::create(move |ctx| {
+        let addr: Addr<Syn, _> = HttpServer::create(move |ctx| {
             ctx.add_message_stream(
                 stream
                     .map_err(|_| ())
                     .map(move |(t, _)| Conn{io: WrapperStream::new(t), peer: None, http2: false}));
             self
         });
-        signals.map(|signals| signals.send(
+        signals.map(|signals| signals.do_send(
-            signal::Subscribe(addr.clone().subscriber())));
+            signal::Subscribe(addr.clone().recipient())));
         addr
     }
 }
@@ -477,24 +477,6 @@ impl<H: IntoHttpHandler> Handler<signal::Signal> for HttpServer<H>
     }
 }
 
-impl<T, H> Handler<io::Result<Conn<T>>> for HttpServer<H>
-    where T: IoStream,
-          H: IntoHttpHandler,
-{
-    type Result = ();
-
-    fn handle(&mut self, msg: io::Result<Conn<T>>, _: &mut Context<Self>) -> Self::Result {
-        match msg {
-            Ok(msg) =>
-                Arbiter::handle().spawn(
-                    HttpChannel::new(
-                        Rc::clone(self.h.as_ref().unwrap()), msg.io, msg.peer, msg.http2)),
-            Err(err) =>
-                debug!("Error handling request: {}", err),
-        }
-    }
-}
-
 impl<T, H> Handler<Conn<T>> for HttpServer<H>
     where T: IoStream,
           H: IntoHttpHandler,
@@ -535,7 +517,7 @@ impl<H: IntoHttpHandler> Handler<ResumeServer> for HttpServer<H>
 
 impl<H: IntoHttpHandler> Handler<StopServer> for HttpServer<H>
 {
-    type Result = actix::Response<Self, StopServer>;
+    type Result = actix::Response<(), ()>;
 
     fn handle(&mut self, msg: StopServer, ctx: &mut Context<Self>) -> Self::Result {
         // stop accept threads
@@ -554,7 +536,7 @@ impl<H: IntoHttpHandler> Handler<StopServer> for HttpServer<H>
         };
         for worker in &self.workers {
             let tx2 = tx.clone();
-            let fut = worker.call(self, StopWorker{graceful: dur});
+            let fut = worker.send(StopWorker{graceful: dur}).into_actor(self);
             ActorFuture::then(fut, move |_, slf, _| {
                 slf.workers.pop();
                 if slf.workers.is_empty() {
@@ -562,7 +544,7 @@ impl<H: IntoHttpHandler> Handler<StopServer> for HttpServer<H>
 
                     // we need to stop system if server was spawned
                     if slf.exit {
-                        Arbiter::system().send(actix::msgs::SystemExit(0))
+                        Arbiter::system().do_send(actix::msgs::SystemExit(0))
                     }
                 }
                 actix::fut::ok(())
@@ -570,12 +552,12 @@ impl<H: IntoHttpHandler> Handler<StopServer> for HttpServer<H>
         }
 
         if !self.workers.is_empty() {
-            Response::async_reply(
+            Response::async(
-                rx.into_future().map(|_| ()).map_err(|_| ()).actfuture())
+                rx.into_future().map(|_| ()).map_err(|_| ()))
         } else {
             // we need to stop system if server was spawned
             if self.exit {
-                Arbiter::system().send(actix::msgs::SystemExit(0))
+                Arbiter::system().do_send(actix::msgs::SystemExit(0))
             }
             Response::reply(Ok(()))
         }

src/server/worker.rs

@@ -37,12 +37,14 @@ pub(crate) struct Conn<T> {
 
 /// Stop worker message. Returns `true` on successful shutdown
 /// and `false` if some connections still alive.
-#[derive(Message)]
-#[rtype(bool)]
 pub(crate) struct StopWorker {
     pub graceful: Option<time::Duration>,
 }
 
+impl Message for StopWorker {
+    type Result = Result<bool, ()>;
+}
+
 /// Http worker
 ///
 /// Worker accepts Socket objects via unbounded channel and start requests processing.
@@ -76,14 +78,14 @@ impl<H: HttpHandler + 'static> Worker<H> {
             let num = slf.settings.num_channels();
             if num == 0 {
                 let _ = tx.send(true);
-                Arbiter::arbiter().send(StopArbiter(0));
+                Arbiter::arbiter().do_send(StopArbiter(0));
             } else if let Some(d) = dur.checked_sub(time::Duration::new(1, 0)) {
                 slf.shutdown_timeout(ctx, tx, d);
             } else {
                 info!("Force shutdown http worker, {} connections", num);
                 slf.settings.head().traverse::<TcpStream, H>();
                 let _ = tx.send(false);
-                Arbiter::arbiter().send(StopArbiter(0));
+                Arbiter::arbiter().do_send(StopArbiter(0));
             }
         });
     }
@@ -117,7 +119,7 @@ impl<H> Handler<Conn<net::TcpStream>> for Worker<H>
 impl<H> Handler<StopWorker> for Worker<H>
     where H: HttpHandler + 'static,
 {
-    type Result = Response<Self, StopWorker>;
+    type Result = Response<bool, ()>;
 
     fn handle(&mut self, msg: StopWorker, ctx: &mut Context<Self>) -> Self::Result {
         let num = self.settings.num_channels();
@@ -128,7 +130,7 @@ impl<H> Handler<StopWorker> for Worker<H>
             info!("Graceful http worker shutdown, {} connections", num);
             let (tx, rx) = oneshot::channel();
             self.shutdown_timeout(ctx, tx, dur);
-            Response::async_reply(rx.map_err(|_| ()).actfuture())
+            Response::async(rx.map_err(|_| ()))
         } else {
             info!("Force shutdown http worker, {} connections", num);
             self.settings.head().traverse::<TcpStream, H>();

src/test.rs

@@ -56,7 +56,7 @@ pub struct TestServer {
     addr: net::SocketAddr,
     thread: Option<thread::JoinHandle<()>>,
     system: SystemRunner,
-    server_sys: Addr<Syn<System>>,
+    server_sys: Addr<Syn, System>,
 }
 
 impl TestServer {
@@ -165,7 +165,7 @@ impl TestServer {
     /// Stop http server
     fn stop(&mut self) {
         if let Some(handle) = self.thread.take() {
-            self.server_sys.send(msgs::SystemExit(0));
+            self.server_sys.do_send(msgs::SystemExit(0));
             let _ = handle.join();
         }
     }

src/ws/client.rs

@@ -103,7 +103,7 @@ pub struct WsClient {
     http_err: Option<HttpError>,
     origin: Option<HeaderValue>,
     protocols: Option<String>,
-    conn: Addr<Unsync<ClientConnector>>,
+    conn: Addr<Unsync, ClientConnector>,
 }
 
 impl WsClient {
@@ -114,7 +114,7 @@ impl WsClient {
     }
 
     /// Create new websocket connection with custom `ClientConnector`
-    pub fn with_connector<S: AsRef<str>>(uri: S, conn: Addr<Unsync<ClientConnector>>) -> WsClient {
+    pub fn with_connector<S: AsRef<str>>(uri: S, conn: Addr<Unsync, ClientConnector>) -> WsClient {
         let mut cl = WsClient {
             request: ClientRequest::build(),
             err: None,
@@ -200,7 +200,7 @@ impl WsClient {
 
         // get connection and start handshake
         Ok(Box::new(
-            self.conn.call_fut(Connect(request.uri().clone()))
+            self.conn.send(Connect(request.uri().clone()))
                 .map_err(|_| WsClientError::Disconnected)
                 .and_then(|res| match res {
                     Ok(stream) => Either::A(WsHandshake::new(stream, request)),

src/ws/context.rs

@@ -5,9 +5,9 @@ use futures::unsync::oneshot;
 use smallvec::SmallVec;
 
 use actix::{Actor, ActorState, ActorContext, AsyncContext,
-            Addr, Handler, ResponseType, SpawnHandle, MessageResult, Syn, Unsync};
+            Addr, Handler, Message, Syn, Unsync, SpawnHandle};
 use actix::fut::ActorFuture;
-use actix::dev::{ContextImpl, ToEnvelope, RemoteEnvelope};
+use actix::dev::{ContextImpl, ToEnvelope, SyncEnvelope};
 
 use body::{Body, Binary};
 use error::{Error, ErrorInternalServerError};
@@ -67,13 +67,13 @@ impl<A, S> AsyncContext<A> for WebsocketContext<A, S> where A: Actor<Context=Sel
 
     #[doc(hidden)]
     #[inline]
-    fn unsync_address(&mut self) -> Addr<Unsync<A>> {
+    fn unsync_address(&mut self) -> Addr<Unsync, A> {
         self.inner.unsync_address()
     }
 
     #[doc(hidden)]
     #[inline]
-    fn sync_address(&mut self) -> Addr<Syn<A>> {
+    fn sync_address(&mut self) -> Addr<Syn, A> {
         self.inner.sync_address()
     }
 }
@@ -217,12 +217,12 @@ impl<A, S> ActorHttpContext for WebsocketContext<A, S> where A: Actor<Context=Se
     }
 }
 
-impl<A, M, S> ToEnvelope<Syn<A>, M> for WebsocketContext<A, S>
+impl<A, M, S> ToEnvelope<Syn, A, M> for WebsocketContext<A, S>
     where A: Actor<Context=WebsocketContext<A, S>> + Handler<M>,
-          M: ResponseType + Send + 'static, M::Item: Send, M::Error: Send,
+          M: Message + Send + 'static, M::Result: Send
 {
-    fn pack(msg: M, tx: Option<Sender<MessageResult<M>>>) -> Syn<A> {
+    fn pack(msg: M, tx: Option<Sender<M::Result>>) -> SyncEnvelope<A> {
-        Syn::new(Box::new(RemoteEnvelope::envelope(msg, tx)))
+        SyncEnvelope::new(msg, tx)
     }
 }
 

src/ws/mod.rs

@@ -47,7 +47,7 @@ use bytes::BytesMut;
 use http::{Method, StatusCode, header};
 use futures::{Async, Poll, Stream};
 
-use actix::{Actor, AsyncContext, ResponseType, Handler};
+use actix::{Actor, AsyncContext, Handler};
 
 use body::Binary;
 use payload::ReadAny;
@@ -74,7 +74,7 @@ const SEC_WEBSOCKET_VERSION: &str = "SEC-WEBSOCKET-VERSION";
 
 
 /// `WebSocket` Message
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Message)]
 pub enum Message {
     Text(String),
     Binary(Binary),
@@ -85,11 +85,6 @@ pub enum Message {
     Error
 }
 
-impl ResponseType for Message {
-    type Item = ();
-    type Error = ();
-}
-
 /// Do websocket handshake and start actor
 pub fn start<A, S>(mut req: HttpRequest<S>, actor: A) -> Result<HttpResponse, Error>
     where A: Actor<Context=WebsocketContext<A, S>> + Handler<Message>,

tests/test_server.rs

@@ -72,12 +72,12 @@ fn test_start() {
     assert!(reqwest::get(&format!("http://{}/", addr)).unwrap().status().is_success());
 
     // pause
-    let _ = srv_addr.call_fut(server::PauseServer).wait();
+    let _ = srv_addr.send(server::PauseServer).wait();
     thread::sleep(time::Duration::from_millis(100));
     assert!(net::TcpStream::connect(addr).is_err());
 
     // resume
-    let _ = srv_addr.call_fut(server::ResumeServer).wait();
+    let _ = srv_addr.send(server::ResumeServer).wait();
     assert!(reqwest::get(&format!("http://{}/", addr)).unwrap().status().is_success());
 }