Skip to content

Commit 3312468

Browse files
committed
Bump to 0.7.0
1 parent 4e24376 commit 3312468

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
22

33
name = "conduit-test"
4-
version = "0.6.2"
4+
version = "0.7.0"
55
authors = ["[email protected]",
66
"Alex Crichton <[email protected]>"]
77
description = "Testing utilities for conduit-based stacks"
88
repository = "https://github.com/conduit-rust/conduit-test"
99
license = "MIT"
1010

1111
[dependencies]
12-
conduit = "0.6"
12+
conduit = "0.7"
1313
semver = "0.1"

src/lib.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
#![feature(io, core)]
1+
#![feature(io, core, net)]
22

33
extern crate semver;
44
extern crate conduit;
55

6-
use std::old_io::net::ip::{IpAddr, Ipv4Addr};
7-
use std::old_io::MemReader;
86
use std::collections::HashMap;
7+
use std::io::prelude::*;
8+
use std::io::Cursor;
9+
use std::net::IpAddr;
910

1011
use semver::Version;
1112
use conduit::{Method, Scheme, Host, Extensions, Headers, TypeMap};
@@ -18,7 +19,7 @@ pub struct MockRequest {
1819
build_headers: HashMap<String, String>,
1920
headers: MockHeaders,
2021
extensions: TypeMap,
21-
reader: Option<MemReader>
22+
reader: Option<Cursor<Vec<u8>>>
2223
}
2324

2425
impl MockRequest {
@@ -109,7 +110,7 @@ impl conduit::Request for MockRequest {
109110
}
110111

111112
fn remote_ip(&self) -> IpAddr {
112-
Ipv4Addr(127, 0, 0, 1)
113+
IpAddr::new_v4(127, 0, 0, 1)
113114
}
114115

115116
fn content_length(&self) -> Option<u64> {
@@ -120,12 +121,12 @@ impl conduit::Request for MockRequest {
120121
&self.headers as &Headers
121122
}
122123

123-
fn body(&mut self) -> &mut Reader {
124+
fn body(&mut self) -> &mut Read {
124125
if self.reader.is_none() {
125126
let body = self.body.clone().unwrap_or(Vec::new());
126-
self.reader = Some(MemReader::new(body));
127+
self.reader = Some(Cursor::new(body));
127128
}
128-
self.reader.as_mut().unwrap() as &mut Reader
129+
self.reader.as_mut().unwrap()
129130
}
130131

131132
fn extensions(&self) -> &Extensions {

0 commit comments

Comments
 (0)