tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-02 00:00:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

io: move into tokio crate (#1691)

Browse Source 
A step towards collapsing Tokio sub crates into a single `tokio`
crate (#1318).

The `io` implementation is now provided by the main `tokio` crate.
Functionality can be opted out of by using the various net related
feature flags.
This commit is contained in:
Carl Lerche
2019-10-26 08:02:49 -07:00
committed by GitHub
parent 227533d456
commit 987ba7373c
79 changed files with 188 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio-util/src/codec/decoder.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use crate::codec::encoder::Encoder;
use crate::codec::Framed;
use tokio_io::{AsyncRead, AsyncWrite};
use tokio::io::{AsyncRead, AsyncWrite};
use bytes::BytesMut;
use std::io;
tokio-util/src/codec/framed.rs
+1 -1
View File
@@ -3,7 +3,7 @@ use crate::codec::encoder::Encoder;
use crate::codec::framed_read::{framed_read2, framed_read2_with_buffer, FramedRead2};
use crate::codec::framed_write::{framed_write2, framed_write2_with_buffer, FramedWrite2};
use tokio_io::{AsyncBufRead, AsyncRead, AsyncWrite};
use tokio::io::{AsyncBufRead, AsyncRead, AsyncWrite};
use bytes::BytesMut;
use futures_core::Stream;
tokio-util/src/codec/framed_read.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use crate::codec::framed::Fuse;
use crate::codec::Decoder;
use tokio_io::AsyncRead;
use tokio::io::AsyncRead;
use bytes::BytesMut;
use futures_core::Stream;
tokio-util/src/codec/framed_write.rs
+1 -1
View File
@@ -2,7 +2,7 @@ use crate::codec::decoder::Decoder;
use crate::codec::encoder::Encoder;
use crate::codec::framed::Fuse;
use tokio_io::{AsyncBufRead, AsyncRead, AsyncWrite};
use tokio::io::{AsyncBufRead, AsyncRead, AsyncWrite};
use bytes::BytesMut;
use futures_core::{ready, Stream};
tokio-util/src/codec/length_delimited.rs
+21 -21
View File
@@ -15,7 +15,7 @@
//! byte stream into a stream of frames.
//!
//! ```
//! use tokio_io::{AsyncRead, AsyncWrite};
//! use tokio::io::{AsyncRead, AsyncWrite};
//! use tokio_util::codec::{Framed, LengthDelimitedCodec};
//!
//! fn bind_transport<T: AsyncRead + AsyncWrite>(io: T)
@@ -78,7 +78,7 @@
//! frame head in the yielded `BytesMut`.
//!
//! ```
//! # use tokio_io::AsyncRead;
//! # use tokio::io::AsyncRead;
//! # use tokio_util::codec::LengthDelimitedCodec;
//! # fn bind_read<T: AsyncRead>(io: T) {
//! LengthDelimitedCodec::builder()
@@ -112,7 +112,7 @@
//! frame head in the yielded `BytesMut`.
//!
//! ```
//! # use tokio_io::AsyncRead;
//! # use tokio::io::AsyncRead;
//! # use tokio_util::codec::LengthDelimitedCodec;
//! # fn bind_read<T: AsyncRead>(io: T) {
//! LengthDelimitedCodec::builder()
@@ -144,7 +144,7 @@
//! **includes** the frame head length.
//!
//! ```
//! # use tokio_io::AsyncRead;
//! # use tokio::io::AsyncRead;
//! # use tokio_util::codec::LengthDelimitedCodec;
//! # fn bind_read<T: AsyncRead>(io: T) {
//! LengthDelimitedCodec::builder()
@@ -178,7 +178,7 @@
//! frame head, including the frame head in the yielded `BytesMut`.
//!
//! ```
//! # use tokio_io::AsyncRead;
//! # use tokio::io::AsyncRead;
//! # use tokio_util::codec::LengthDelimitedCodec;
//! # fn bind_read<T: AsyncRead>(io: T) {
//! LengthDelimitedCodec::builder()
@@ -222,7 +222,7 @@
//! included.
//!
//! ```
//! # use tokio_io::AsyncRead;
//! # use tokio::io::AsyncRead;
//! # use tokio_util::codec::LengthDelimitedCodec;
//! # fn bind_read<T: AsyncRead>(io: T) {
//! LengthDelimitedCodec::builder()
@@ -268,7 +268,7 @@
//! length.
//!
//! ```
//! # use tokio_io::AsyncRead;
//! # use tokio::io::AsyncRead;
//! # use tokio_util::codec::LengthDelimitedCodec;
//! # fn bind_read<T: AsyncRead>(io: T) {
//! LengthDelimitedCodec::builder()
@@ -313,7 +313,7 @@
//! configuration:
//!
//! ```
//! # use tokio_io::AsyncWrite;
//! # use tokio::io::AsyncWrite;
//! # use tokio_util::codec::LengthDelimitedCodec;
//! # fn write_frame<T: AsyncWrite>(io: T) {
//! # let _ =
@@ -342,7 +342,7 @@
use crate::codec::{Decoder, Encoder, Framed, FramedRead, FramedWrite};
use tokio_io::{AsyncRead, AsyncWrite};
use tokio::io::{AsyncRead, AsyncWrite};
use bytes::{Buf, BufMut, Bytes, BytesMut, IntoBuf};
use std::error::Error as StdError;
@@ -605,7 +605,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -649,7 +649,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -673,7 +673,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -697,7 +697,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -731,7 +731,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -755,7 +755,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -778,7 +778,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -799,7 +799,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -823,7 +823,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -865,7 +865,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncRead;
/// # use tokio::io::AsyncRead;
/// use tokio_util::codec::LengthDelimitedCodec;
///
/// # fn bind_read<T: AsyncRead>(io: T) {
@@ -890,7 +890,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::AsyncWrite;
/// # use tokio::io::AsyncWrite;
/// # use tokio_util::codec::LengthDelimitedCodec;
/// # fn write_frame<T: AsyncWrite>(io: T) {
/// LengthDelimitedCodec::builder()
@@ -911,7 +911,7 @@ impl Builder {
/// # Examples
///
/// ```
/// # use tokio_io::{AsyncRead, AsyncWrite};
/// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use tokio_util::codec::LengthDelimitedCodec;
/// # fn write_frame<T: AsyncRead + AsyncWrite>(io: T) {
/// # let _ =