AsRawSocket, not AsRawHandle

This commit is contained in:
Steven Fackler 2015-04-28 23:42:42 -07:00
parent f8ccb821d1
commit f30dd2f1c0

View File

@ -7,7 +7,7 @@ use unix_socket::UnixStream;
#[cfg(unix)] #[cfg(unix)]
use std::os::unix::io::{AsRawFd, RawFd}; use std::os::unix::io::{AsRawFd, RawFd};
#[cfg(windows)] #[cfg(windows)]
use std::os::windows::io::{AsRawHandle, RawHandle}; use std::os::windows::io::{AsRawSocket, RawSocket};
use {SslMode, ConnectError, ConnectParams, ConnectTarget}; use {SslMode, ConnectError, ConnectParams, ConnectTarget};
use io::{NegotiateSsl, StreamWrapper}; use io::{NegotiateSsl, StreamWrapper};
@ -19,7 +19,7 @@ const DEFAULT_PORT: u16 = 5432;
/// A connection to the Postgres server. /// A connection to the Postgres server.
/// ///
/// It implements `Read`, `Write` and `StreamWrapper`, as well as `AsRawFd` on /// It implements `Read`, `Write` and `StreamWrapper`, as well as `AsRawFd` on
/// Unix platforms and `AsRawHandle` on Windows platforms. /// Unix platforms and `AsRawSocket` on Windows platforms.
pub struct Stream(InternalStream); pub struct Stream(InternalStream);
impl Read for Stream { impl Read for Stream {
@ -60,11 +60,11 @@ impl AsRawFd for Stream {
} }
#[cfg(windows)] #[cfg(windows)]
impl AsRawHandle for Stream { impl AsRawSocket for Stream {
fn as_raw_handle(&self) -> RawHandle { fn as_raw_socket(&self) -> RawSocket {
// Unix sockets aren't supported on windows, so no need to match // Unix sockets aren't supported on windows, so no need to match
match self.0 { match self.0 {
InternalStream::Tcp(ref s) => s.as_raw_handle(), InternalStream::Tcp(ref s) => s.as_raw_socket(),
} }
} }
} }