@@ -2,7 +2,7 @@ extern mod extra;
2
2
3
3
use std:: cell:: Cell ;
4
4
use std:: comm:: SharedChan ;
5
- use std:: task:: { spawn_with , spawn_supervised } ;
5
+ use std:: task:: spawn ;
6
6
use std:: io:: { Listener , Acceptor , Writer } ;
7
7
use std:: io:: net:: ip:: SocketAddr ;
8
8
use std:: io:: io_error;
@@ -54,7 +54,9 @@ impl<T: Send + Clone + Server> ServerUtil for T {
54
54
debug ! ( "listening" ) ;
55
55
let ( perf_po, perf_ch) = stream ( ) ;
56
56
let perf_ch = SharedChan :: new ( perf_ch) ;
57
- spawn_with ( perf_po, perf_dumper) ;
57
+ do spawn {
58
+ perf_dumper( perf_po) ;
59
+ }
58
60
loop {
59
61
// OK, we're sort of shadowing an IoError here. Perhaps this should be done in a
60
62
// separate task so that it can safely fail...
@@ -78,7 +80,7 @@ impl<T: Send + Clone + Server> ServerUtil for T {
78
80
let stream = Cell :: new( optstream. unwrap( ) ) ;
79
81
let child_perf_ch = perf_ch. clone( ) ;
80
82
let child_self = self . clone( ) ;
81
- do spawn_supervised {
83
+ do spawn {
82
84
let mut time_start = time_start;
83
85
let mut stream = BufferedStream : : new( stream. take( ) ) ;
84
86
debug ! ( "accepted connection, got {:?}" , stream) ;
@@ -103,6 +105,7 @@ impl<T: Send + Clone + Server> ServerUtil for T {
103
105
response. write_headers( ) ;
104
106
} ,
105
107
}
108
+
106
109
// Ensure the request is flushed, any Transfer-Encoding completed, etc.
107
110
response. finish_response( ) ;
108
111
let time_finished = precise_time_ns( ) ;
0 commit comments