From 720d8c36c1e664e741e087baa651fc263cf8dd75 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Mon, 12 Feb 2018 12:45:08 -0800 Subject: [PATCH] update names --- src/context.rs | 4 ++-- src/ws/context.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/context.rs b/src/context.rs index 7603ea059..a8ccfd4e4 100644 --- a/src/context.rs +++ b/src/context.rs @@ -8,7 +8,7 @@ use smallvec::SmallVec; use actix::{Actor, ActorState, ActorContext, AsyncContext, 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}; @@ -210,7 +210,7 @@ impl ToEnvelope, M> for HttpContext M: Message + Send + 'static, M::Result: Send, { fn pack(msg: M, tx: Option>) -> Syn { - Syn::new(Box::new(RemoteEnvelope::envelope(msg, tx))) + Syn::new(Box::new(SyncEnvelope::envelope(msg, tx))) } } diff --git a/src/ws/context.rs b/src/ws/context.rs index 6792e51cd..6f84ea483 100644 --- a/src/ws/context.rs +++ b/src/ws/context.rs @@ -7,7 +7,7 @@ use smallvec::SmallVec; use actix::{Actor, ActorState, ActorContext, AsyncContext, 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}; @@ -222,7 +222,7 @@ impl ToEnvelope, M> for WebsocketContext M: Message + Send + 'static, M::Result: Send { fn pack(msg: M, tx: Option>) -> Syn { - Syn::new(Box::new(RemoteEnvelope::envelope(msg, tx))) + Syn::new(Box::new(SyncEnvelope::envelope(msg, tx))) } }