1
- #![ feature( io, core) ]
1
+ #![ feature( io, core, net ) ]
2
2
3
3
extern crate semver;
4
4
extern crate conduit;
5
5
6
- use std:: old_io:: net:: ip:: { IpAddr , Ipv4Addr } ;
7
- use std:: old_io:: MemReader ;
8
6
use std:: collections:: HashMap ;
7
+ use std:: io:: prelude:: * ;
8
+ use std:: io:: Cursor ;
9
+ use std:: net:: IpAddr ;
9
10
10
11
use semver:: Version ;
11
12
use conduit:: { Method , Scheme , Host , Extensions , Headers , TypeMap } ;
@@ -18,7 +19,7 @@ pub struct MockRequest {
18
19
build_headers : HashMap < String , String > ,
19
20
headers : MockHeaders ,
20
21
extensions : TypeMap ,
21
- reader : Option < MemReader >
22
+ reader : Option < Cursor < Vec < u8 > > >
22
23
}
23
24
24
25
impl MockRequest {
@@ -109,7 +110,7 @@ impl conduit::Request for MockRequest {
109
110
}
110
111
111
112
fn remote_ip ( & self ) -> IpAddr {
112
- Ipv4Addr ( 127 , 0 , 0 , 1 )
113
+ IpAddr :: new_v4 ( 127 , 0 , 0 , 1 )
113
114
}
114
115
115
116
fn content_length ( & self ) -> Option < u64 > {
@@ -120,12 +121,12 @@ impl conduit::Request for MockRequest {
120
121
& self . headers as & Headers
121
122
}
122
123
123
- fn body ( & mut self ) -> & mut Reader {
124
+ fn body ( & mut self ) -> & mut Read {
124
125
if self . reader . is_none ( ) {
125
126
let body = self . body . clone ( ) . unwrap_or ( Vec :: new ( ) ) ;
126
- self . reader = Some ( MemReader :: new ( body) ) ;
127
+ self . reader = Some ( Cursor :: new ( body) ) ;
127
128
}
128
- self . reader . as_mut ( ) . unwrap ( ) as & mut Reader
129
+ self . reader . as_mut ( ) . unwrap ( )
129
130
}
130
131
131
132
fn extensions ( & self ) -> & Extensions {
0 commit comments