diff --git a/Cargo.toml b/Cargo.toml index 010c675..a9b6ee7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ futures-util = "0.3" async-trait = "0.1" parking_lot = "0.11" rand = "0.7" -bytes = "0.5" +bytes = "1" tokio = { version = "1", features = ["full"], optional = true } tokio-util = { version = "0.6", features = ["compat"], optional = true } num-traits = "0.2" @@ -33,7 +33,7 @@ uuid = { version = "0.8", features = ["v4"] } regex = "1" lazy_static = "1" log = "0.4" -futures_codec = "0.4" +asynchronous-codec = "0.6" async-std = { version = "1", features = ["attributes"], optional = true } [dev-dependencies] diff --git a/src/codec/framed.rs b/src/codec/framed.rs index a11d1ad..b1fa85c 100644 --- a/src/codec/framed.rs +++ b/src/codec/framed.rs @@ -1,5 +1,5 @@ use crate::codec::ZmqCodec; -use futures_codec::{FramedRead, FramedWrite}; +use asynchronous_codec::{FramedRead, FramedWrite}; // Enables us to have multiple bounds on the dyn trait in `InnerFramed` pub trait FrameableRead: futures::AsyncRead + Unpin + Send + Sync {} @@ -7,10 +7,10 @@ impl FrameableRead for T where T: futures::AsyncRead + Unpin + Send + Sync {} pub trait FrameableWrite: futures::AsyncWrite + Unpin + Send + Sync {} impl FrameableWrite for T where T: futures::AsyncWrite + Unpin + Send + Sync {} -pub(crate) type ZmqFramedRead = futures_codec::FramedRead, ZmqCodec>; -pub(crate) type ZmqFramedWrite = futures_codec::FramedWrite, ZmqCodec>; +pub(crate) type ZmqFramedRead = asynchronous_codec::FramedRead, ZmqCodec>; +pub(crate) type ZmqFramedWrite = asynchronous_codec::FramedWrite, ZmqCodec>; -/// Equivalent to [`futures_codec::Framed`] +/// Equivalent to [`asynchronous_codec::Framed`] pub struct FramedIo { pub read_half: ZmqFramedRead, pub write_half: ZmqFramedWrite, diff --git a/src/codec/zmq_codec.rs b/src/codec/zmq_codec.rs index 97e203d..62dcca4 100644 --- a/src/codec/zmq_codec.rs +++ b/src/codec/zmq_codec.rs @@ -4,8 +4,8 @@ use super::greeting::ZmqGreeting; use super::Message; use crate::ZmqMessage; +use asynchronous_codec::{Decoder, Encoder}; use bytes::{Buf, BufMut, Bytes, BytesMut}; -use futures_codec::{Decoder, Encoder}; use std::convert::TryFrom; #[derive(Debug, Clone, Copy)] diff --git a/src/lib.rs b/src/lib.rs index a415bad..327f886 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -45,9 +45,9 @@ use util::PeerIdentity; extern crate enum_primitive_derive; use async_trait::async_trait; +use asynchronous_codec::FramedWrite; use futures::channel::mpsc; use futures::FutureExt; -use futures_codec::FramedWrite; use num_traits::ToPrimitive; use parking_lot::Mutex; use std::collections::HashMap; diff --git a/src/util.rs b/src/util.rs index af15d2a..5a4976c 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,10 +1,10 @@ use crate::codec::{CodecResult, FramedIo}; use crate::*; +use asynchronous_codec::FramedRead; use bytes::Bytes; use futures::stream::StreamExt; use futures::SinkExt; -use futures_codec::FramedRead; use num_traits::Pow; use rand::Rng; use std::convert::{TryFrom, TryInto};