fix(rustup): update io import, Writer::write
Make it build with the latest rust-nightly (2015-01-27) Renamed io import to old_io. Renamed Writer::write to Writer::write_all
This commit is contained in:
committed by
Sean McArthur
parent
537d691d61
commit
f606b6039d
16
src/mock.rs
16
src/mock.rs
@@ -1,6 +1,6 @@
|
||||
use std::fmt;
|
||||
use std::io::{IoResult, MemReader, MemWriter};
|
||||
use std::io::net::ip::SocketAddr;
|
||||
use std::old_io::{IoResult, MemReader, MemWriter};
|
||||
use std::old_io::net::ip::SocketAddr;
|
||||
|
||||
use net::{NetworkStream, NetworkConnector};
|
||||
|
||||
@@ -55,8 +55,8 @@ impl Reader for MockStream {
|
||||
}
|
||||
|
||||
impl Writer for MockStream {
|
||||
fn write(&mut self, msg: &[u8]) -> IoResult<()> {
|
||||
self.write.write(msg)
|
||||
fn write_all(&mut self, msg: &[u8]) -> IoResult<()> {
|
||||
self.write.write_all(msg)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ macro_rules! mock_connector (
|
||||
|
||||
impl ::net::NetworkConnector for $name {
|
||||
type Stream = ::mock::MockStream;
|
||||
fn connect(&mut self, host: &str, port: u16, scheme: &str) -> ::std::io::IoResult<::mock::MockStream> {
|
||||
fn connect(&mut self, host: &str, port: u16, scheme: &str) -> ::std::old_io::IoResult<::mock::MockStream> {
|
||||
use std::collections::HashMap;
|
||||
debug!("MockStream::connect({:?}, {:?}, {:?})", host, port, scheme);
|
||||
let mut map = HashMap::new();
|
||||
@@ -95,10 +95,10 @@ macro_rules! mock_connector (
|
||||
|
||||
let key = format!("{}://{}", scheme, host);
|
||||
// ignore port for now
|
||||
match map.get(&&*key) {
|
||||
match map.get(&*key) {
|
||||
Some(res) => Ok(::mock::MockStream {
|
||||
write: ::std::io::MemWriter::new(),
|
||||
read: ::std::io::MemReader::new(res.to_string().into_bytes())
|
||||
write: ::std::old_io::MemWriter::new(),
|
||||
read: ::std::old_io::MemReader::new(res.to_string().into_bytes())
|
||||
}),
|
||||
None => panic!("{:?} doesn't know url {}", stringify!($name), key)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user