Skip to content

Commit 226871b

Browse files
committed
update for rust master
spawn_with and spawn_supervised have been removed in this pull request: rust-lang/rust#10603
1 parent ee351f1 commit 226871b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/http/server/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ extern mod extra;
22

33
use std::cell::Cell;
44
use std::comm::SharedChan;
5-
use std::task::{spawn_with, spawn_supervised};
5+
use std::task::spawn;
66
use std::io::{Listener, Acceptor, Writer};
77
use std::io::net::ip::SocketAddr;
88
use std::io::io_error;
@@ -54,7 +54,9 @@ impl<T: Send + Clone + Server> ServerUtil for T {
5454
debug!("listening");
5555
let (perf_po, perf_ch) = stream();
5656
let perf_ch = SharedChan::new(perf_ch);
57-
spawn_with(perf_po, perf_dumper);
57+
do spawn {
58+
perf_dumper(perf_po);
59+
}
5860
loop {
5961
// OK, we're sort of shadowing an IoError here. Perhaps this should be done in a
6062
// separate task so that it can safely fail...
@@ -78,7 +80,7 @@ impl<T: Send + Clone + Server> ServerUtil for T {
7880
let stream = Cell::new(optstream.unwrap());
7981
let child_perf_ch = perf_ch.clone();
8082
let child_self = self.clone();
81-
do spawn_supervised {
83+
do spawn {
8284
let mut time_start = time_start;
8385
let mut stream = BufferedStream::new(stream.take());
8486
debug!("accepted connection, got {:?}", stream);
@@ -103,6 +105,7 @@ impl<T: Send + Clone + Server> ServerUtil for T {
103105
response.write_headers();
104106
},
105107
}
108+
106109
// Ensure the request is flushed, any Transfer-Encoding completed, etc.
107110
response.finish_response();
108111
let time_finished = precise_time_ns();

0 commit comments

Comments
 (0)