From cb4aea394e6851ae8cc45a68beeaf2c93cc9a0c0 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Tue, 14 May 2019 10:27:36 -0700 Subject: Update Tokio to Rust 2018 (#1082) --- tokio-io/src/codec/bytes_codec.rs | 2 +- tokio-io/src/codec/decoder.rs | 8 +++--- tokio-io/src/codec/lines_codec.rs | 2 +- tokio-io/src/codec/mod.rs | 55 ++++++++++++++++++--------------------- 4 files changed, 31 insertions(+), 36 deletions(-) (limited to 'tokio-io/src/codec') diff --git a/tokio-io/src/codec/bytes_codec.rs b/tokio-io/src/codec/bytes_codec.rs index ecfd15ab..66369478 100644 --- a/tokio-io/src/codec/bytes_codec.rs +++ b/tokio-io/src/codec/bytes_codec.rs @@ -1,7 +1,7 @@ #![allow(deprecated)] +use crate::codec::{Decoder, Encoder}; use bytes::{BufMut, Bytes, BytesMut}; -use codec::{Decoder, Encoder}; use std::io; /// A simple `Codec` implementation that just ships bytes around. diff --git a/tokio-io/src/codec/decoder.rs b/tokio-io/src/codec/decoder.rs index cd5777de..f4c2d2cf 100644 --- a/tokio-io/src/codec/decoder.rs +++ b/tokio-io/src/codec/decoder.rs @@ -1,11 +1,9 @@ +use super::encoder::Encoder; +use crate::_tokio_codec::Framed; +use crate::{AsyncRead, AsyncWrite}; use bytes::BytesMut; use std::io; -use super::encoder::Encoder; -use {AsyncRead, AsyncWrite}; - -use _tokio_codec::Framed; - /// Decoding of frames via buffers. /// /// This trait is used when constructing an instance of `Framed` or diff --git a/tokio-io/src/codec/lines_codec.rs b/tokio-io/src/codec/lines_codec.rs index 818397fa..65048911 100644 --- a/tokio-io/src/codec/lines_codec.rs +++ b/tokio-io/src/codec/lines_codec.rs @@ -1,7 +1,7 @@ #![allow(deprecated)] +use crate::codec::{Decoder, Encoder}; use bytes::{BufMut, BytesMut}; -use codec::{Decoder, Encoder}; use std::{io, str}; /// A simple `Codec` implementation that splits up data into lines. diff --git a/tokio-io/src/codec/mod.rs b/tokio-io/src/codec/mod.rs index 66368217..20bac082 100644 --- a/tokio-io/src/codec/mod.rs +++ b/tokio-io/src/codec/mod.rs @@ -27,10 +27,9 @@ pub use self::bytes_codec::BytesCodec; pub use self::decoder::Decoder; pub use self::encoder::Encoder; pub use self::lines_codec::LinesCodec; - -pub use framed::{Framed, FramedParts}; -pub use framed_read::FramedRead; -pub use framed_write::FramedWrite; +pub use crate::framed::{Framed, FramedParts}; +pub use crate::framed_read::FramedRead; +pub use crate::framed_write::FramedWrite; #[deprecated(since = "0.1.8", note = "Moved to tokio-codec")] #[doc(hidden)] @@ -74,10 +73,6 @@ pub mod length_delimited { //! Specifically, given the following: //! //! ``` - //! # extern crate tokio_io; - //! # extern crate bytes; - //! # extern crate futures; - //! # //! use tokio_io::{AsyncRead, AsyncWrite}; //! use tokio_io::codec::length_delimited; //! use bytes::BytesMut; @@ -89,8 +84,6 @@ pub mod length_delimited { //! //! transport.send(frame).wait().unwrap(); //! } - //! # - //! # pub fn main() {} //! ``` //! //! The encoded frame will look like this: @@ -115,8 +108,9 @@ pub mod length_delimited { //! frame head in the yielded `BytesMut`. //! //! ``` - //! # use tokio_io::AsyncRead; - //! # use tokio_io::codec::length_delimited; + //! use tokio_io::AsyncRead; + //! use tokio_io::codec::length_delimited; + //! //! # fn bind_read(io: T) { //! length_delimited::Builder::new() //! .length_field_offset(0) // default value @@ -148,8 +142,9 @@ pub mod length_delimited { //! frame head in the yielded `BytesMut`. //! //! ``` - //! # use tokio_io::AsyncRead; - //! # use tokio_io::codec::length_delimited; + //! use tokio_io::AsyncRead; + //! use tokio_io::codec::length_delimited; + //! //! # fn bind_read(io: T) { //! length_delimited::Builder::new() //! .length_field_offset(0) // default value @@ -179,8 +174,9 @@ pub mod length_delimited { //! **includes** the frame head length. //! //! ``` - //! # use tokio_io::AsyncRead; - //! # use tokio_io::codec::length_delimited; + //! use tokio_io::AsyncRead; + //! use tokio_io::codec::length_delimited; + //! //! # fn bind_read(io: T) { //! length_delimited::Builder::new() //! .length_field_offset(0) // default value @@ -212,8 +208,9 @@ pub mod length_delimited { //! frame head, including the frame head in the yielded `BytesMut`. //! //! ``` - //! # use tokio_io::AsyncRead; - //! # use tokio_io::codec::length_delimited; + //! use tokio_io::AsyncRead; + //! use tokio_io::codec::length_delimited; + //! //! # fn bind_read(io: T) { //! length_delimited::Builder::new() //! .length_field_offset(0) // default value @@ -255,8 +252,9 @@ pub mod length_delimited { //! included. //! //! ``` - //! # use tokio_io::AsyncRead; - //! # use tokio_io::codec::length_delimited; + //! use tokio_io::AsyncRead; + //! use tokio_io::codec::length_delimited; + //! //! # fn bind_read(io: T) { //! length_delimited::Builder::new() //! .length_field_offset(1) // length of hdr1 @@ -300,8 +298,9 @@ pub mod length_delimited { //! length. //! //! ``` - //! # use tokio_io::AsyncRead; - //! # use tokio_io::codec::length_delimited; + //! use tokio_io::AsyncRead; + //! use tokio_io::codec::length_delimited; + //! //! # fn bind_read(io: T) { //! length_delimited::Builder::new() //! .length_field_offset(1) // length of hdr1 @@ -345,18 +344,16 @@ pub mod length_delimited { //! configuration: //! //! ``` - //! # extern crate tokio_io; - //! # extern crate bytes; - //! # use tokio_io::AsyncWrite; - //! # use tokio_io::codec::length_delimited; - //! # use bytes::BytesMut; + //! use tokio_io::AsyncWrite; + //! use tokio_io::codec::length_delimited; + //! use bytes::BytesMut; + //! //! # fn write_frame(io: T) { //! # let _: length_delimited::FramedWrite = //! length_delimited::Builder::new() //! .length_field_length(2) //! .new_write(io); //! # } - //! # pub fn main() {} //! ``` //! //! A payload of `hello world` will be encoded as: @@ -374,5 +371,5 @@ pub mod length_delimited { //! [`Encoder`]: ../trait.Encoder.html //! [`BytesMut`]: https://docs.rs/bytes/0.4/bytes/struct.BytesMut.html - pub use length_delimited::*; + pub use crate::length_delimited::*; } -- cgit v1.2.3