Skip to content

Commit 33874f9

Browse files
seanmonstarseanmonstar
authored
Merge pull request #1482 from hyperium/unfutures-02
Revert futures 0.2 changes
2 parents 72e02d6 + c210524 commit 33874f9

34 files changed

+1369
-1448
lines changed

‎Cargo.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@ include = [
2222

2323
[dependencies]
2424
bytes = "0.4.4"
25-
futures = "=0.2.0-beta"
26-
futures-core = "=0.2.0-beta"
27-
futures-timer = { git = "https://github.com/alexcrichton/futures-timer.git", rev = "682e792" }
25+
futures = "0.1.17"
26+
futures-cpupool = "0.1.6"
27+
futures-timer = "0.1.0"
2828
http = "0.1.5"
2929
httparse = "1.0"
3030
iovec = "0.1"
3131
log = "0.4"
3232
net2 = "0.2.32"
3333
time = "0.1"
34-
tokio = { git = "https://github.com/seanmonstar/tokio.git", branch = "futures2-use-after-free", features = ["unstable-futures"] }
35-
tokio-executor = { git = "https://github.com/seanmonstar/tokio.git", branch = "futures2-use-after-free", features = ["unstable-futures"] }
36-
want = { git = "https://github.com/srijs/want.git", branch = "futures-0.2" }
34+
tokio = "0.1.5"
35+
tokio-executor = "0.1.0"
36+
tokio-service = "0.1"
37+
tokio-io = "0.1"
38+
want = "0.0.2"
3739

3840
[dev-dependencies]
3941
num_cpus = "1.0"
@@ -43,6 +45,3 @@ url = "1.0"
4345

4446
[features]
4547
nightly = []
46-
47-
[replace]
48-
"futures:0.2.0-beta" = { git = "https://github.com/rust-lang-nursery/futures-rs", rev = "30473ba" }

‎benches/end_to_end.rs

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ extern crate tokio;
88

99
use std::net::SocketAddr;
1010

11-
use futures::{FutureExt, StreamExt};
12-
use futures::executor::block_on;
11+
use futures::{Future, Stream};
1312
use tokio::runtime::Runtime;
1413
use tokio::net::TcpListener;
1514

@@ -23,20 +22,19 @@ fn get_one_at_a_time(b: &mut test::Bencher) {
2322
let addr = spawn_hello(&mut rt);
2423

2524
let client = hyper::Client::configure()
26-
.build(&rt.handle());
25+
.build_with_executor(&rt.reactor(), rt.executor());
2726

2827
let url: hyper::Uri = format!("http://{}/get", addr).parse().unwrap();
2928

3029
b.bytes = 160 * 2 + PHRASE.len() as u64;
3130
b.iter(move || {
32-
block_on(client.get(url.clone())
33-
.with_executor(rt.executor())
31+
client.get(url.clone())
3432
.and_then(|res| {
3533
res.into_body().into_stream().for_each(|_chunk| {
3634
Ok(())
37-
}).map(|_| ())
35+
})
3836
})
39-
).expect("client wait");
37+
.wait().expect("client wait");
4038
});
4139
}
4240

@@ -46,7 +44,7 @@ fn post_one_at_a_time(b: &mut test::Bencher) {
4644
let addr = spawn_hello(&mut rt);
4745

4846
let client = hyper::Client::configure()
49-
.build(&rt.handle());
47+
.build_with_executor(&rt.reactor(), rt.executor());
5048

5149
let url: hyper::Uri = format!("http://{}/post", addr).parse().unwrap();
5250

@@ -56,14 +54,11 @@ fn post_one_at_a_time(b: &mut test::Bencher) {
5654
let mut req = Request::new(post.into());
5755
*req.method_mut() = Method::POST;
5856
*req.uri_mut() = url.clone();
59-
block_on(client.request(req)
60-
.with_executor(rt.executor())
61-
.and_then(|res| {
62-
res.into_body().into_stream().for_each(|_chunk| {
63-
Ok(())
64-
}).map(|_| ())
57+
client.request(req).and_then(|res| {
58+
res.into_body().into_stream().for_each(|_chunk| {
59+
Ok(())
6560
})
66-
).expect("client wait");
61+
}).wait().expect("client wait");
6762

6863
});
6964
}
@@ -81,22 +76,21 @@ fn spawn_hello(rt: &mut Runtime) -> SocketAddr {
8176
let service = const_service(service_fn(|req: Request<Body>| {
8277
req.into_body()
8378
.into_stream()
84-
.concat()
79+
.concat2()
8580
.map(|_| {
8681
Response::new(Body::from(PHRASE))
8782
})
8883
}));
8984

9085
let srv = listener.incoming()
91-
.next()
86+
.into_future()
9287
.map_err(|(e, _inc)| panic!("accept error: {}", e))
9388
.and_then(move |(accepted, _inc)| {
9489
let socket = accepted.expect("accepted socket");
9590
http.serve_connection(socket, service.new_service().expect("new_service"))
9691
.map(|_| ())
9792
.map_err(|_| ())
98-
})
99-
.map_err(|_| panic!("server error"));
100-
rt.spawn2(srv);
93+
});
94+
rt.spawn(srv);
10195
return addr
10296
}

‎benches/server.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use std::io::{Read, Write};
1111
use std::net::{TcpListener, TcpStream};
1212
use std::sync::mpsc;
1313

14-
use futures::{future, stream, FutureExt, StreamExt};
15-
use futures::channel::oneshot;
14+
use futures::{future, stream, Future, Stream};
15+
use futures::sync::oneshot;
1616

1717
use hyper::{Body, Request, Response};
1818
use hyper::server::Service;
@@ -31,7 +31,7 @@ macro_rules! bench_server {
3131
})).unwrap();
3232
let addr = srv.local_addr().unwrap();
3333
addr_tx.send(addr).unwrap();
34-
tokio::runtime::run2(srv.run_until(until_rx.map_err(|_| ())).map_err(|e| panic!("server error: {}", e)));
34+
tokio::run(srv.run_until(until_rx.map_err(|_| ())).map_err(|e| panic!("server error: {}", e)));
3535
});
3636

3737
addr_rx.recv().unwrap()

‎examples/client.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extern crate pretty_env_logger;
88
use std::env;
99
use std::io::{self, Write};
1010

11-
use futures::{FutureExt, StreamExt};
11+
use futures::{Future, Stream};
1212
use futures::future::lazy;
1313

1414
use hyper::{Body, Client, Request};
@@ -30,7 +30,7 @@ fn main() {
3030
return;
3131
}
3232

33-
tokio::runtime::run2(lazy(move |_| {
33+
tokio::run(lazy(move || {
3434
let client = Client::default();
3535

3636
let mut req = Request::new(Body::empty());
@@ -43,13 +43,10 @@ fn main() {
4343
res.into_parts().1.into_stream().for_each(|chunk| {
4444
io::stdout().write_all(&chunk).map_err(From::from)
4545
})
46-
}).then(|result| {
47-
if let Some(err) = result.err() {
48-
eprintln!("Error {}", err);
49-
} else {
50-
println!("\n\nDone.");
51-
}
52-
Ok(())
46+
}).map(|_| {
47+
println!("\n\nDone.");
48+
}).map_err(|err| {
49+
eprintln!("Error {}", err);
5350
})
5451
}));
5552
}

‎examples/hello.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extern crate futures;
44
extern crate pretty_env_logger;
55
extern crate tokio;
66

7-
use futures::FutureExt;
7+
use futures::Future;
88
use futures::future::lazy;
99

1010
use hyper::{Body, Response};
@@ -20,13 +20,13 @@ fn main() {
2020
Ok(Response::new(Body::from(PHRASE)))
2121
}));
2222

23-
tokio::runtime::run2(lazy(move |_| {
23+
tokio::run(lazy(move || {
2424
let server = Http::new()
2525
.sleep_on_errors(true)
2626
.bind(&addr, new_service)
2727
.unwrap();
2828

29-
println!("Listening on http://{}", server.local_addr().unwrap());
30-
server.run().map_err(|err| panic!("Server error {}", err))
29+
println!("Listening on http://{} with 1 thread.", server.local_addr().unwrap());
30+
server.run().map_err(|err| eprintln!("Server error {}", err))
3131
}));
3232
}

‎examples/multi_server.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ extern crate futures;
44
extern crate pretty_env_logger;
55
extern crate tokio;
66

7-
use futures::{FutureExt, StreamExt};
7+
use futures::{Future, Stream};
88
use futures::future::{FutureResult, lazy};
9-
use futures::executor::spawn;
109

1110
use hyper::{Body, Method, Request, Response, StatusCode};
1211
use hyper::server::{Http, Service};
@@ -44,20 +43,22 @@ fn main() {
4443
let addr1 = "127.0.0.1:1337".parse().unwrap();
4544
let addr2 = "127.0.0.1:1338".parse().unwrap();
4645

47-
tokio::runtime::run2(lazy(move |_| {
46+
tokio::run(lazy(move || {
4847
let srv1 = Http::new().serve_addr(&addr1, || Ok(Srv(INDEX1))).unwrap();
4948
let srv2 = Http::new().serve_addr(&addr2, || Ok(Srv(INDEX2))).unwrap();
5049

5150
println!("Listening on http://{}", srv1.incoming_ref().local_addr());
5251
println!("Listening on http://{}", srv2.incoming_ref().local_addr());
5352

54-
spawn(srv1.map_err(|err| panic!("srv1 error: {:?}", err)).for_each(move |conn| {
55-
spawn(conn.map(|_| ()).map_err(|err| panic!("srv1 error: {:?}", err)))
56-
}).map(|_| ()));
53+
tokio::spawn(srv1.for_each(move |conn| {
54+
tokio::spawn(conn.map(|_| ()).map_err(|err| println!("srv1 error: {:?}", err)));
55+
Ok(())
56+
}).map_err(|_| ()));
5757

58-
spawn(srv2.map_err(|err| panic!("srv2 error: {:?}", err)).for_each(move |conn| {
59-
spawn(conn.map(|_| ()).map_err(|err| panic!("srv2 error: {:?}", err)))
60-
}).map(|_| ()));
58+
tokio::spawn(srv2.for_each(move |conn| {
59+
tokio::spawn(conn.map(|_| ()).map_err(|err| println!("srv2 error: {:?}", err)));
60+
Ok(())
61+
}).map_err(|_| ()));
6162

6263
Ok(())
6364
}));

‎examples/params.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extern crate pretty_env_logger;
55
extern crate tokio;
66
extern crate url;
77

8-
use futures::{Future, FutureExt, StreamExt};
8+
use futures::{Future, Stream};
99
use futures::future::lazy;
1010

1111
use hyper::{Body, Method, Request, Response, StatusCode};
@@ -32,7 +32,7 @@ impl Service for ParamExample {
3232
Box::new(futures::future::ok(Response::new(INDEX.into())))
3333
},
3434
(&Method::POST, "/post") => {
35-
Box::new(req.into_parts().1.into_stream().concat().map(|b| {
35+
Box::new(req.into_parts().1.into_stream().concat2().map(|b| {
3636
// Parse the request body. form_urlencoded::parse
3737
// always succeeds, but in general parsing may
3838
// fail (for example, an invalid post of json), so
@@ -98,11 +98,9 @@ fn main() {
9898
pretty_env_logger::init();
9999
let addr = "127.0.0.1:1337".parse().unwrap();
100100

101-
tokio::runtime::run2(lazy(move |_| {
101+
tokio::run(lazy(move || {
102102
let server = Http::new().bind(&addr, || Ok(ParamExample)).unwrap();
103-
println!("Listening on http://{}", server.local_addr().unwrap());
104-
server.run().recover(|err| {
105-
eprintln!("Server error {}", err)
106-
})
103+
println!("Listening on http://{} with 1 thread.", server.local_addr().unwrap());
104+
server.run().map_err(|err| eprintln!("Server error {}", err))
107105
}));
108106
}

‎examples/send_file.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ extern crate hyper;
44
extern crate pretty_env_logger;
55
extern crate tokio;
66

7-
use futures::{Future, FutureExt};
7+
use futures::{Future/*, Sink*/};
88
use futures::future::lazy;
9-
use futures::channel::oneshot;
9+
use futures::sync::oneshot;
1010

1111
use hyper::{Body, /*Chunk,*/ Method, Request, Response, StatusCode};
1212
use hyper::error::Error;
@@ -141,9 +141,9 @@ fn main() {
141141
pretty_env_logger::init();
142142
let addr = "127.0.0.1:1337".parse().unwrap();
143143

144-
tokio::runtime::run2(lazy(move |_| {
144+
tokio::run(lazy(move || {
145145
let server = Http::new().bind(&addr, || Ok(ResponseExamples)).unwrap();
146-
println!("Listening on http://{}", server.local_addr().unwrap());
147-
server.run().map_err(|err| panic!("Server error {}", err))
146+
println!("Listening on http://{} with 1 thread.", server.local_addr().unwrap());
147+
server.run().map_err(|err| eprintln!("Server error {}", err))
148148
}));
149149
}

‎examples/server.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extern crate hyper;
44
extern crate pretty_env_logger;
55
extern crate tokio;
66

7-
use futures::FutureExt;
7+
use futures::Future;
88
use futures::future::{FutureResult, lazy};
99

1010
use hyper::{Body, Method, Request, Response, StatusCode};
@@ -43,11 +43,9 @@ fn main() {
4343
pretty_env_logger::init();
4444
let addr = "127.0.0.1:1337".parse().unwrap();
4545

46-
tokio::runtime::run2(lazy(move |_| {
46+
tokio::run(lazy(move || {
4747
let server = Http::new().bind(&addr, || Ok(Echo)).unwrap();
48-
println!("Listening on http://{}", server.local_addr().unwrap());
49-
server.run().recover(|err| {
50-
eprintln!("Server error {}", err)
51-
})
48+
println!("Listening on http://{} with 1 thread.", server.local_addr().unwrap());
49+
server.run().map_err(|err| eprintln!("Server error {}", err))
5250
}));
5351
}

‎examples/web_api.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ extern crate hyper;
44
extern crate pretty_env_logger;
55
extern crate tokio;
66

7-
use futures::{Future, FutureExt, StreamExt};
8-
use futures::executor::spawn;
7+
use futures::{Future, Stream};
98
use futures::future::lazy;
109
use tokio::reactor::Handle;
1110

@@ -79,15 +78,13 @@ fn main() {
7978
pretty_env_logger::init();
8079
let addr = "127.0.0.1:1337".parse().unwrap();
8180

82-
tokio::runtime::run2(lazy(move |_| {
81+
tokio::run(lazy(move || {
8382
let handle = Handle::current();
8483
let serve = Http::new().serve_addr(&addr, move || Ok(ResponseExamples(handle.clone()))).unwrap();
85-
println!("Listening on http://{}", serve.incoming_ref().local_addr());
84+
println!("Listening on http://{} with 1 thread.", serve.incoming_ref().local_addr());
8685

87-
serve.map_err(|err| panic!("server error {:?}", err)).for_each(move |conn| {
88-
spawn(conn.recover(|err| {
89-
println!("connection error: {:?}", err);
90-
}))
91-
}).map(|_| ())
86+
serve.map_err(|_| ()).for_each(move |conn| {
87+
tokio::spawn(conn.map(|_| ()).map_err(|err| println!("serve error: {:?}", err)))
88+
})
9289
}));
9390
}

0 commit comments

Comments
 (0)