Skip to content

Commit 030cf5f

Browse files
sfacklersfackler
committed
Fix for IO changes
1 parent cfe9df7 commit 030cf5f

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

‎openssl-sys/src/probe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::os;
2-
use std::io::fs::PathExtensions;
2+
use std::old_io::fs::PathExtensions;
33

44
pub struct ProbeResult {
55
pub cert_file: Option<Path>,

‎src/bio/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use libc::{c_void, c_int};
2-
use std::io::{EndOfFile, IoResult, IoError, OtherIoError};
3-
use std::io::{Reader, Writer};
2+
use std::old_io::{EndOfFile, IoResult, IoError, OtherIoError};
3+
use std::old_io::{Reader, Writer};
44
use std::ptr;
55

66
use ffi;
@@ -87,7 +87,7 @@ impl Reader for MemBio {
8787
}
8888

8989
impl Writer for MemBio {
90-
fn write(&mut self, buf: &[u8]) -> IoResult<()> {
90+
fn write_all(&mut self, buf: &[u8]) -> IoResult<()> {
9191
let ret = unsafe {
9292
ffi::BIO_write(self.bio, buf.as_ptr() as *const c_void,
9393
buf.len() as c_int)

‎src/crypto/hash.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use libc::c_uint;
22
use std::ptr;
3-
use std::io;
3+
use std::old_io;
44
use std::iter::repeat;
55

66
use ffi;
@@ -59,8 +59,8 @@ pub struct Hasher {
5959
len: u32,
6060
}
6161

62-
impl io::Writer for Hasher {
63-
fn write(&mut self, buf: &[u8]) -> io::IoResult<()> {
62+
impl old_io::Writer for Hasher {
63+
fn write_all(&mut self, buf: &[u8]) -> old_io::IoResult<()> {
6464
self.update(buf);
6565
Ok(())
6666
}
@@ -163,7 +163,7 @@ mod tests {
163163

164164
pub fn hash_writer(t: super::HashType, data: &[u8]) -> Vec<u8> {
165165
let mut h = super::Hasher::new(t);
166-
h.write(data).unwrap();
166+
h.write_all(data).unwrap();
167167
h.finalize()
168168
}
169169

‎src/crypto/pkey.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ impl PKey {
149149

150150
}
151151
let buf = try!(mem_bio.read_to_end().map_err(StreamError));
152-
writer.write(buf.as_slice()).map_err(StreamError)
152+
writer.write_all(buf.as_slice()).map_err(StreamError)
153153
}
154154

155155
/**

‎src/ssl/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use libc::c_ulong;
55
use std::error;
66
use std::fmt;
77
use std::ffi::c_str_to_bytes;
8-
use std::io::IoError;
8+
use std::old_io::IoError;
99

1010
use ffi;
1111

‎src/ssl/mod.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use libc::{c_int, c_void, c_long};
22
use std::ffi::{CString, c_str_to_bytes};
3-
use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer};
3+
use std::old_io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer};
44
use std::mem;
55
use std::fmt;
66
use std::num::FromPrimitive;
@@ -291,8 +291,8 @@ impl<'ssl> MemBioRef<'ssl> {
291291
(&mut self.bio as &mut Reader).read(buf).ok()
292292
}
293293

294-
fn write(&mut self, buf: &[u8]) {
295-
let _ = (&mut self.bio as &mut Writer).write(buf);
294+
fn write_all(&mut self, buf: &[u8]) {
295+
let _ = (&mut self.bio as &mut Writer).write_all(buf);
296296
}
297297
}
298298

@@ -357,7 +357,7 @@ impl Ssl {
357357
buf.len() as c_int) }
358358
}
359359

360-
fn write(&self, buf: &[u8]) -> c_int {
360+
fn write_all(&self, buf: &[u8]) -> c_int {
361361
unsafe { ffi::SSL_write(self.ssl.0, buf.as_ptr() as *const c_void,
362362
buf.len() as c_int) }
363363
}
@@ -510,7 +510,7 @@ impl<S: Stream> SslStream<S> {
510510
LibSslError::ErrorWantRead => {
511511
try_ssl_stream!(self.flush());
512512
let len = try_ssl_stream!(self.stream.read(self.buf.as_mut_slice()));
513-
self.ssl.get_rbio().write(&self.buf[..len]);
513+
self.ssl.get_rbio().write_all(&self.buf[..len]);
514514
}
515515
LibSslError::ErrorWantWrite => { try_ssl_stream!(self.flush()) }
516516
LibSslError::ErrorZeroReturn => return Err(SslSessionClosed),
@@ -523,7 +523,7 @@ impl<S: Stream> SslStream<S> {
523523
fn write_through(&mut self) -> IoResult<()> {
524524
loop {
525525
match self.ssl.get_wbio().read(self.buf.as_mut_slice()) {
526-
Some(len) => try!(self.stream.write(&self.buf[..len])),
526+
Some(len) => try!(self.stream.write_all(&self.buf[..len])),
527527
None => break
528528
};
529529
}
@@ -565,11 +565,11 @@ impl<S: Stream> Reader for SslStream<S> {
565565
}
566566

567567
impl<S: Stream> Writer for SslStream<S> {
568-
fn write(&mut self, buf: &[u8]) -> IoResult<()> {
568+
fn write_all(&mut self, buf: &[u8]) -> IoResult<()> {
569569
let mut start = 0;
570570
while start < buf.len() {
571571
let ret = self.in_retry_wrapper(|ssl| {
572-
ssl.write(buf.split_at(start).1)
572+
ssl.write_all(buf.split_at(start).1)
573573
});
574574
match ret {
575575
Ok(len) => start += len as usize,
@@ -605,10 +605,10 @@ impl<S> Reader for MaybeSslStream<S> where S: Stream {
605605
}
606606

607607
impl<S> Writer for MaybeSslStream<S> where S: Stream{
608-
fn write(&mut self, buf: &[u8]) -> IoResult<()> {
608+
fn write_all(&mut self, buf: &[u8]) -> IoResult<()> {
609609
match *self {
610-
MaybeSslStream::Ssl(ref mut s) => s.write(buf),
611-
MaybeSslStream::Normal(ref mut s) => s.write(buf),
610+
MaybeSslStream::Ssl(ref mut s) => s.write_all(buf),
611+
MaybeSslStream::Normal(ref mut s) => s.write_all(buf),
612612
}
613613
}
614614

‎src/ssl/tests.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use serialize::hex::FromHex;
2-
use std::io::net::tcp::TcpStream;
3-
use std::io::{Writer};
2+
use std::old_io::net::tcp::TcpStream;
3+
use std::old_io::{Writer};
44
use std::thread::Thread;
55

66
use crypto::hash::HashType::{SHA256};
@@ -179,17 +179,17 @@ fn test_verify_callback_data() {
179179
fn test_write() {
180180
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
181181
let mut stream = SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap();
182-
stream.write("hello".as_bytes()).unwrap();
182+
stream.write_all("hello".as_bytes()).unwrap();
183183
stream.flush().unwrap();
184-
stream.write(" there".as_bytes()).unwrap();
184+
stream.write_all(" there".as_bytes()).unwrap();
185185
stream.flush().unwrap();
186186
}
187187

188188
#[test]
189189
fn test_read() {
190190
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
191191
let mut stream = SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap();
192-
stream.write("GET /\r\n\r\n".as_bytes()).unwrap();
192+
stream.write_all("GET /\r\n\r\n".as_bytes()).unwrap();
193193
stream.flush().unwrap();
194194
stream.read_to_end().ok().expect("read error");
195195
}
@@ -200,7 +200,7 @@ fn test_clone() {
200200
let mut stream = SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap();
201201
let mut stream2 = stream.clone();
202202
let _t = Thread::spawn(move || {
203-
stream2.write("GET /\r\n\r\n".as_bytes()).unwrap();
203+
stream2.write_all("GET /\r\n\r\n".as_bytes()).unwrap();
204204
stream2.flush().unwrap();
205205
});
206206
stream.read_to_end().ok().expect("read error");

‎src/x509/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ impl<'a, T: AsStr<'a>> ToStr for Vec<T> {
149149
/// ```
150150
/// # #[allow(unstable)]
151151
/// # fn main() {
152-
/// use std::io::{File, Open, Write};
153-
/// # use std::io::fs;
152+
/// use std::old_io::{File, Open, Write};
153+
/// # use std::old_io::fs;
154154
///
155155
/// use openssl::crypto::hash::HashType;
156156
/// use openssl::x509::{KeyUsage, X509Generator};
@@ -371,7 +371,7 @@ impl<'ctx> X509<'ctx> {
371371
pub fn from_pem<R>(reader: &mut R) -> Result<X509<'ctx>, SslError> where R: Reader {
372372
let mut mem_bio = try!(MemBio::new());
373373
let buf = try!(reader.read_to_end().map_err(StreamError));
374-
try!(mem_bio.write(buf.as_slice()).map_err(StreamError));
374+
try!(mem_bio.write_all(buf.as_slice()).map_err(StreamError));
375375

376376
unsafe {
377377
let handle = try_ssl_null!(ffi::PEM_read_bio_X509(mem_bio.get_handle(),
@@ -417,7 +417,7 @@ impl<'ctx> X509<'ctx> {
417417
self.handle));
418418
}
419419
let buf = try!(mem_bio.read_to_end().map_err(StreamError));
420-
writer.write(buf.as_slice()).map_err(StreamError)
420+
writer.write_all(buf.as_slice()).map_err(StreamError)
421421
}
422422
}
423423

‎src/x509/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use serialize::hex::FromHex;
2-
use std::io::{File, Open, Read};
3-
use std::io::util::NullWriter;
2+
use std::old_io::{File, Open, Read};
3+
use std::old_io::util::NullWriter;
44

55
use crypto::hash::HashType::{SHA256};
66
use x509::{X509, X509Generator};

0 commit comments

Comments
 (0)