From 58f85658bd7411dbffef5a5169dffd30996d6d9b Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Wed, 31 Jan 2018 12:57:02 -0800
Subject: [PATCH] update actix
---
src/context.rs | 12 +++++-------
src/ws/context.rs | 12 +++++-------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/context.rs b/src/context.rs
index 614184d1d..19a2b4a0c 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -8,7 +8,7 @@ use smallvec::SmallVec;
use actix::{Actor, ActorState, ActorContext, AsyncContext,
Address, SyncAddress, Handler, ResponseType, MessageResult, SpawnHandle};
use actix::fut::ActorFuture;
-use actix::dev::{AsyncContextApi, ContextImpl, Envelope, ToEnvelope, RemoteEnvelope};
+use actix::dev::{ContextImpl, Envelope, ToEnvelope, RemoteEnvelope};
use body::{Body, Binary};
use error::{Error, ErrorInternalServerError};
@@ -81,14 +81,12 @@ impl<A, S> AsyncContext<A> for HttpContext<A, S> where A: Actor<Context=Self>
fn cancel_future(&mut self, handle: SpawnHandle) -> bool {
self.inner.cancel_future(handle)
}
-}
-
-#[doc(hidden)]
-impl<A, S> AsyncContextApi<A> for HttpContext<A, S> where A: Actor<Context=Self> {
+ #[doc(hidden)]
#[inline]
- fn unsync_address(&mut self) -> Address<A> {
+ fn local_address(&mut self) -> Address<A> {
self.inner.unsync_address()
}
+ #[doc(hidden)]
#[inline]
fn sync_address(&mut self) -> SyncAddress<A> {
self.inner.sync_address()
@@ -211,7 +209,7 @@ impl<A, S> ToEnvelope<A> for HttpContext<A, S>
where A: Actor<Context=HttpContext<A, S>>,
{
#[inline]
- fn pack_msg<M>(msg: M, tx: Option<Sender<MessageResult<M>>>) -> Envelope<A>
+ fn pack<M>(msg: M, tx: Option<Sender<MessageResult<M>>>) -> Envelope<A>
where A: Handler<M>,
M: ResponseType + Send + 'static, M::Item: Send, M::Error: Send
{
diff --git a/src/ws/context.rs b/src/ws/context.rs
index 6c0598b7e..d977a69b5 100644
--- a/src/ws/context.rs
+++ b/src/ws/context.rs
@@ -7,7 +7,7 @@ use smallvec::SmallVec;
use actix::{Actor, ActorState, ActorContext, AsyncContext,
Address, SyncAddress, Handler, ResponseType, SpawnHandle, MessageResult};
use actix::fut::ActorFuture;
-use actix::dev::{AsyncContextApi, ContextImpl, Envelope, ToEnvelope, RemoteEnvelope};
+use actix::dev::{ContextImpl, Envelope, ToEnvelope, RemoteEnvelope};
use body::{Body, Binary};
use error::{Error, ErrorInternalServerError};
@@ -64,16 +64,14 @@ impl<A, S> AsyncContext<A> for WebsocketContext<A, S> where A: Actor<Context=Sel
fn cancel_future(&mut self, handle: SpawnHandle) -> bool {
self.inner.cancel_future(handle)
}
-}
-
-#[doc(hidden)]
-impl<A, S> AsyncContextApi<A> for WebsocketContext<A, S> where A: Actor<Context=Self> {
+ #[doc(hidden)]
#[inline]
- fn unsync_address(&mut self) -> Address<A> {
+ fn local_address(&mut self) -> Address<A> {
self.inner.unsync_address()
}
+ #[doc(hidden)]
#[inline]
fn sync_address(&mut self) -> SyncAddress<A> {
self.inner.sync_address()
@@ -235,7 +233,7 @@ impl<A, S> ToEnvelope<A> for WebsocketContext<A, S>
where A: Actor<Context=WebsocketContext<A, S>>,
{
#[inline]
- fn pack_msg<M>(msg: M, tx: Option<Sender<MessageResult<M>>>) -> Envelope<A>
+ fn pack<M>(msg: M, tx: Option<Sender<MessageResult<M>>>) -> Envelope<A>
where A: Handler<M>,
M: ResponseType + Send + 'static, M::Item: Send, M::Error: Send {
RemoteEnvelope::envelope(msg, tx).into()