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

Track futures tokio-reform branch (#88)

Browse Source 
This patch also updates tests and examples to remove deprecated API
usage.
This commit is contained in:
Carl Lerche
2018-02-01 10:31:07 -08:00
committed by GitHub
parent b9db119b45
commit 2e94b658ed
24 changed files with 66 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/line-frames.rs
+8 -8
View File
@@ -10,7 +10,7 @@ use std::net::Shutdown;
use bytes::{BytesMut, BufMut};
use futures::{Future, Stream, Sink};
use futures::future::Executor;
use futures::future::{blocking, Executor};
use futures_cpupool::CpuPool;
use tokio::net::{TcpListener, TcpStream};
use tokio_io::codec::{Encoder, Decoder};
@@ -68,20 +68,20 @@ fn echo() {
pool.execute(srv.map_err(|e| panic!("srv error: {}", e))).unwrap();
let client = TcpStream::connect(&addr);
let client = client.wait().unwrap();
let (client, _) = write_all(client, b"a\n").wait().unwrap();
let (client, buf, amt) = read(client, vec![0; 1024]).wait().unwrap();
let client = blocking(client).wait().unwrap();
let (client, _) = blocking(write_all(client, b"a\n")).wait().unwrap();
let (client, buf, amt) = blocking(read(client, vec![0; 1024])).wait().unwrap();
assert_eq!(amt, 2);
assert_eq!(&buf[..2], b"a\n");
let (client, _) = write_all(client, b"\n").wait().unwrap();
let (client, buf, amt) = read(client, buf).wait().unwrap();
let (client, _) = blocking(write_all(client, b"\n")).wait().unwrap();
let (client, buf, amt) = blocking(read(client, buf)).wait().unwrap();
assert_eq!(amt, 1);
assert_eq!(&buf[..1], b"\n");
let (client, _) = write_all(client, b"b").wait().unwrap();
let (client, _) = blocking(write_all(client, b"b")).wait().unwrap();
client.shutdown(Shutdown::Write).unwrap();
let (_client, buf, amt) = read(client, buf).wait().unwrap();
let (_client, buf, amt) = blocking(read(client, buf)).wait().unwrap();
assert_eq!(amt, 1);
assert_eq!(&buf[..1], b"b");
}