std::io -> std::old_io

This commit is contained in:
Aaron Weiss 2015-01-28 12:19:02 -05:00
parent c1cddc8087
commit 147af6c437
6 changed files with 18 additions and 18 deletions

View file

@ -3,7 +3,7 @@
extern crate irc;
use std::default::Default;
use std::io::timer::sleep;
use std::old_io::timer::sleep;
use std::sync::Arc;
use std::thread::Thread;
use std::time::duration::Duration;

View file

@ -2,8 +2,8 @@
#![stable]
#[cfg(feature = "ssl")] use std::borrow::ToOwned;
#[cfg(feature = "ssl")] use std::error::Error;
use std::io::{BufferedReader, BufferedWriter, IoResult, TcpStream};
#[cfg(any(feature = "encode", feature = "ssl"))] use std::io::{IoError, IoErrorKind};
use std::old_io::{BufferedReader, BufferedWriter, IoResult, TcpStream};
#[cfg(any(feature = "encode", feature = "ssl"))] use std::old_io::{IoError, IoErrorKind};
use std::sync::{Mutex, MutexGuard};
#[cfg(feature = "encode")] use encoding::{DecoderTrap, EncoderTrap, Encoding};
#[cfg(feature = "encode")] use encoding::label::encoding_from_whatwg_label;
@ -138,7 +138,7 @@ impl<T: IrcReader, U: IrcWriter> Connection<T, U> {
})
};
let mut writer = self.writer.lock().unwrap();
try!(writer.write(&data[]));
try!(writer.write_all(&data[]));
writer.flush()
}
@ -232,11 +232,11 @@ impl Reader for NetStream {
}
impl Writer for NetStream {
fn write(&mut self, buf: &[u8]) -> IoResult<()> {
fn write_all(&mut self, buf: &[u8]) -> IoResult<()> {
match self {
&mut NetStream::UnsecuredTcpStream(ref mut stream) => stream.write(buf),
&mut NetStream::UnsecuredTcpStream(ref mut stream) => stream.write_all(buf),
#[cfg(feature = "ssl")]
&mut NetStream::SslTcpStream(ref mut stream) => stream.write(buf),
&mut NetStream::SslTcpStream(ref mut stream) => stream.write_all(buf),
}
}
}
@ -244,8 +244,8 @@ impl Writer for NetStream {
#[cfg(test)]
mod test {
use super::Connection;
use std::io::{MemReader, MemWriter};
use std::io::util::{NullReader, NullWriter};
use std::old_io::{MemReader, MemWriter};
use std::old_io::util::{NullReader, NullWriter};
use client::data::message::Message;
#[cfg(feature = "encode")] use encoding::{DecoderTrap, Encoding};
#[cfg(feature = "encode")] use encoding::all::{ISO_8859_15, UTF_8};

View file

@ -1,6 +1,6 @@
//! Enumeration of all available client commands.
#![stable]
use std::io::{InvalidInput, IoError, IoResult};
use std::old_io::{InvalidInput, IoError, IoResult};
use std::str::FromStr;
use client::data::message::{Message, ToMessage};

View file

@ -3,8 +3,8 @@
use std::borrow::ToOwned;
use std::collections::HashMap;
use std::error::Error;
use std::io::fs::File;
use std::io::{InvalidInput, IoError, IoResult};
use std::old_io::fs::File;
use std::old_io::{InvalidInput, IoError, IoResult};
use rustc_serialize::json::decode;
/// Configuration data.

View file

@ -2,7 +2,7 @@
#![stable]
use std::borrow::ToOwned;
use std::collections::HashMap;
use std::io::{BufferedReader, BufferedWriter, IoError, IoErrorKind, IoResult};
use std::old_io::{BufferedReader, BufferedWriter, IoError, IoErrorKind, IoResult};
use std::sync::{Mutex, RwLock};
use client::conn::{Connection, NetStream};
use client::data::{Command, Config, Message, Response, User};
@ -302,8 +302,8 @@ impl<'a, T: IrcReader, U: IrcWriter> Iterator for ServerIterator<'a, T, U> {
mod test {
use super::{IrcServer, Server};
use std::default::Default;
use std::io::{MemReader, MemWriter};
use std::io::util::{NullReader, NullWriter};
use std::old_io::{MemReader, MemWriter};
use std::old_io::util::{NullReader, NullWriter};
use client::conn::Connection;
use client::data::{Config, User};
use client::data::command::Command::PRIVMSG;

View file

@ -1,7 +1,7 @@
//! Utilities and shortcuts for working with IRC servers.
#![stable]
use std::io::IoResult;
use std::old_io::IoResult;
use client::data::{Command, Config, User};
use client::data::Command::{CAP, INVITE, JOIN, KICK, KILL, MODE, NICK, NOTICE};
use client::data::Command::{OPER, PASS, PONG, PRIVMSG, QUIT, SAMODE, SANICK, TOPIC, USER};
@ -237,8 +237,8 @@ impl<'a, T: IrcReader, U: IrcWriter> Wrapper<'a, T, U> {
mod test {
use super::Wrapper;
use std::default::Default;
use std::io::MemWriter;
use std::io::util::NullReader;
use std::old_io::MemWriter;
use std::old_io::util::NullReader;
use client::conn::Connection;
use client::data::Config;
use client::server::IrcServer;