From 95c466056f4936da26dee1f816a126b635c50dad Mon Sep 17 00:00:00 2001 From: Aaron Weiss Date: Sat, 24 Jan 2015 16:18:32 -0500 Subject: [PATCH] Fixed compilation on Rust master. --- src/client/conn.rs | 3 ++- src/client/data/config.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/conn.rs b/src/client/conn.rs index 0fb81b1..1268ae7 100644 --- a/src/client/conn.rs +++ b/src/client/conn.rs @@ -1,5 +1,6 @@ //! Thread-safe connections on IrcStreams. #![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}; @@ -202,7 +203,7 @@ fn ssl_to_io(res: Result) -> IoResult { Err(e) => Err(IoError { kind: IoErrorKind::OtherIoError, desc: "An SSL error occurred.", - detail: e.detail(), + detail: Some(e.description().to_owned()), }), } } diff --git a/src/client/data/config.rs b/src/client/data/config.rs index 99da776..b814284 100644 --- a/src/client/data/config.rs +++ b/src/client/data/config.rs @@ -67,7 +67,7 @@ impl Config { decode(&data[]).map_err(|e| IoError { kind: InvalidInput, desc: "Failed to decode configuration file.", - detail: e.detail(), + detail: Some(e.description().to_owned()), }) }