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

Rename to tokio-core, add in futures-io

Browse Source 
Renames the futures-mio crate to tokio-core, pulls in the futures-io crate under
an `io` module, and gets everything compiling.
This commit is contained in:
Alex Crichton
2016-08-26 14:39:47 -07:00
parent e71d509fee
commit f107c8d860
29 changed files with 1495 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/buffered.rs
+3 -4
View File
@@ -1,6 +1,5 @@
extern crate futures;
extern crate futures_io;
extern crate futures_mio;
extern crate tokio_core;
extern crate env_logger;
use std::net::TcpStream;
@@ -9,7 +8,7 @@ use std::io::{Read, Write, BufReader, BufWriter};
use futures::Future;
use futures::stream::Stream;
use futures_io::copy;
use tokio_core::io::copy;
macro_rules! t {
($e:expr) => (match $e {
@@ -23,7 +22,7 @@ fn echo_server() {
const N: usize = 1024;
drop(env_logger::init());
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let srv = l.handle().tcp_listen(&"127.0.0.1:0".parse().unwrap());
let srv = t!(l.run(srv));
let addr = t!(srv.local_addr());
tests/chain.rs
+3 -4
View File
@@ -1,6 +1,5 @@
extern crate futures;
extern crate futures_io;
extern crate futures_mio;
extern crate tokio_core;
use std::net::TcpStream;
use std::thread;
@@ -8,7 +7,7 @@ use std::io::{Write, Read};
use futures::Future;
use futures::stream::Stream;
use futures_io::read_to_end;
use tokio_core::io::read_to_end;
macro_rules! t {
($e:expr) => (match $e {
@@ -19,7 +18,7 @@ macro_rules! t {
#[test]
fn chain_clients() {
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let srv = l.handle().tcp_listen(&"127.0.0.1:0".parse().unwrap());
let srv = t!(l.run(srv));
let addr = t!(srv.local_addr());
tests/echo.rs
+3 -4
View File
@@ -1,7 +1,6 @@
extern crate env_logger;
extern crate futures;
extern crate futures_io;
extern crate futures_mio;
extern crate tokio_core;
use std::io::{Read, Write};
use std::net::TcpStream;
@@ -9,7 +8,7 @@ use std::thread;
use futures::Future;
use futures::stream::Stream;
use futures_io::{copy, TaskIo};
use tokio_core::io::{copy, TaskIo};
macro_rules! t {
($e:expr) => (match $e {
@@ -22,7 +21,7 @@ macro_rules! t {
fn echo_server() {
drop(env_logger::init());
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let srv = l.handle().tcp_listen(&"127.0.0.1:0".parse().unwrap());
let srv = t!(l.run(srv));
let addr = t!(srv.local_addr());
tests/limit.rs
+3 -4
View File
@@ -1,6 +1,5 @@
extern crate futures;
extern crate futures_io;
extern crate futures_mio;
extern crate tokio_core;
use std::net::TcpStream;
use std::thread;
@@ -8,7 +7,7 @@ use std::io::{Write, Read};
use futures::Future;
use futures::stream::Stream;
use futures_io::read_to_end;
use tokio_core::io::read_to_end;
macro_rules! t {
($e:expr) => (match $e {
@@ -19,7 +18,7 @@ macro_rules! t {
#[test]
fn limit() {
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let srv = l.handle().tcp_listen(&"127.0.0.1:0".parse().unwrap());
let srv = t!(l.run(srv));
let addr = t!(srv.local_addr());
tests/stream-buffered.rs
+3 -4
View File
@@ -1,6 +1,5 @@
extern crate futures;
extern crate futures_io;
extern crate futures_mio;
extern crate tokio_core;
extern crate env_logger;
use std::io::{Read, Write};
@@ -9,7 +8,7 @@ use std::thread;
use futures::Future;
use futures::stream::Stream;
use futures_io::{copy, TaskIo};
use tokio_core::io::{copy, TaskIo};
macro_rules! t {
($e:expr) => (match $e {
@@ -22,7 +21,7 @@ macro_rules! t {
fn echo_server() {
drop(env_logger::init());
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let srv = l.handle().tcp_listen(&"127.0.0.1:0".parse().unwrap());
let srv = t!(l.run(srv));
let addr = t!(srv.local_addr());
tests/tcp.rs
+4 -4
View File
@@ -1,6 +1,6 @@
extern crate env_logger;
extern crate futures;
extern crate futures_mio;
extern crate tokio_core;
use std::net::{TcpListener, TcpStream};
use std::sync::mpsc::channel;
@@ -19,7 +19,7 @@ macro_rules! t {
#[test]
fn connect() {
drop(env_logger::init());
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let srv = t!(TcpListener::bind("127.0.0.1:0"));
let addr = t!(srv.local_addr());
let t = thread::spawn(move || {
@@ -37,7 +37,7 @@ fn connect() {
#[test]
fn accept() {
drop(env_logger::init());
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let srv = l.handle().tcp_listen(&"127.0.0.1:0".parse().unwrap());
let srv = t!(l.run(srv));
let addr = t!(srv.local_addr());
@@ -63,7 +63,7 @@ fn accept() {
#[test]
fn accept2() {
drop(env_logger::init());
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let srv = l.handle().tcp_listen(&"127.0.0.1:0".parse().unwrap());
let srv = t!(l.run(srv));
let addr = t!(srv.local_addr());
tests/timeout.rs
+2 -2
View File
@@ -1,6 +1,6 @@
extern crate env_logger;
extern crate futures;
extern crate futures_mio;
extern crate tokio_core;
use std::time::{Instant, Duration};
@@ -16,7 +16,7 @@ macro_rules! t {
#[test]
fn smoke() {
drop(env_logger::init());
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let dur = Duration::from_millis(10);
let timeout = l.handle().timeout(dur).and_then(|t| t);
let start = Instant::now();
tests/udp.rs
+3 -3
View File
@@ -1,11 +1,11 @@
extern crate futures;
extern crate futures_mio;
extern crate tokio_core;
use std::io;
use std::net::SocketAddr;
use futures::{Future, Poll};
use futures_mio::UdpSocket;
use tokio_core::UdpSocket;
macro_rules! t {
($e:expr) => (match $e {
@@ -16,7 +16,7 @@ macro_rules! t {
#[test]
fn send_messages() {
let mut l = t!(futures_mio::Loop::new());
let mut l = t!(tokio_core::Loop::new());
let a = l.handle().udp_bind(&"127.0.0.1:0".parse().unwrap());
let b = l.handle().udp_bind(&"127.0.0.1:0".parse().unwrap());
let (a, b) = t!(l.run(a.join(b)));