DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Fixed compilation on Rust master.

Browse source
This commit is contained in:
Aaron Weiss 2015-01-24 16:18:32 -05:00
parent da29644eb1
commit 95c466056f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/conn.rs
View file

@ -1,5 +1,6 @@
//! Thread-safe connections on IrcStreams. //! Thread-safe connections on IrcStreams.
#![stable] #![stable]
#[cfg(feature = "ssl")] use std::borrow::ToOwned;
#[cfg(feature = "ssl")] use std::error::Error; #[cfg(feature = "ssl")] use std::error::Error;
use std::io::{BufferedReader, BufferedWriter, IoResult, TcpStream}; use std::io::{BufferedReader, BufferedWriter, IoResult, TcpStream};
#[cfg(any(feature = "encode", feature = "ssl"))] use std::io::{IoError, IoErrorKind}; #[cfg(any(feature = "encode", feature = "ssl"))] use std::io::{IoError, IoErrorKind};
@ -202,7 +203,7 @@ fn ssl_to_io<T>(res: Result<T, SslError>) -> IoResult<T> {
Err(e) => Err(IoError { Err(e) => Err(IoError {
kind: IoErrorKind::OtherIoError, kind: IoErrorKind::OtherIoError,
desc: "An SSL error occurred.", desc: "An SSL error occurred.",
detail: e.detail(), detail: Some(e.description().to_owned()),
}), }),
} }
} }

2
src/client/data/config.rs
View file

@ -67,7 +67,7 @@ impl Config {
decode(&data[]).map_err(|e| IoError { decode(&data[]).map_err(|e| IoError {
kind: InvalidInput, kind: InvalidInput,
desc: "Failed to decode configuration file.", desc: "Failed to decode configuration file.",
detail: e.detail(), detail: Some(e.description().to_owned()),
}) })
} }