about summary refs log tree commit diff
path: root/src/libstd/sys/unix/net.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-31 16:18:55 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-31 16:18:55 -0700
commit50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681 (patch)
tree0546f83f5625d11fc4d5d9b2ad215a4ac3ce4778 /src/libstd/sys/unix/net.rs
parent85e997adfffa5e8511ff31710649038216028832 (diff)
parentac77392f8ab1c201b0c927f6a2d30b632b95acda (diff)
downloadrust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.tar.gz
rust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.zip
rollup merge of #23919: alexcrichton/stabilize-io-error
Conflicts:
	src/libstd/fs/tempdir.rs
	src/libstd/io/error.rs
Diffstat (limited to 'src/libstd/sys/unix/net.rs')
-rw-r--r--src/libstd/sys/unix/net.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs
index 00b907ce10c..908136a42ab 100644
--- a/src/libstd/sys/unix/net.rs
+++ b/src/libstd/sys/unix/net.rs
@@ -35,7 +35,8 @@ pub fn cvt_gai(err: c_int) -> io::Result<()> {
             .to_string()
     };
     Err(io::Error::new(io::ErrorKind::Other,
-                       "failed to lookup address information", Some(detail)))
+                       &format!("failed to lookup address information: {}",
+                                detail)[..]))
 }
 
 impl Socket {