Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The new `std::os::windows` module exposes several extension traits for extracting file descriptors, sockets, and handles from `std::io` types.
- Loading branch information
Showing
4 changed files
with
107 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
//! Experimental extensions to `std` for Windows. | ||
//! | ||
//! For now, this module is limited to extracting handles, file | ||
//! descriptors, and sockets, but its functionality will grow over | ||
//! time. | ||
|
||
#![experimental] | ||
|
||
use sys_common::AsInner; | ||
use libc; | ||
|
||
use io; | ||
|
||
/// Raw HANDLEs. | ||
pub type Handle = libc::HANDLE; | ||
|
||
/// Raw SOCKETs. | ||
pub type Socket = libc::SOCKET; | ||
|
||
/// Extract raw handles. | ||
pub trait AsRawHandle { | ||
/// Extract the raw handle, without taking any ownership. | ||
fn as_raw_handle(&self) -> Handle; | ||
} | ||
|
||
impl AsRawHandle for io::fs::File { | ||
fn as_raw_handle(&self) -> Handle { | ||
self.as_inner().handle() | ||
} | ||
} | ||
|
||
impl AsRawHandle for io::pipe::PipeStream { | ||
fn as_raw_handle(&self) -> Handle { | ||
self.as_inner().handle() | ||
} | ||
} | ||
|
||
impl AsRawHandle for io::net::pipe::UnixStream { | ||
fn as_raw_handle(&self) -> Handle { | ||
self.as_inner().handle() | ||
} | ||
} | ||
|
||
impl AsRawHandle for io::net::pipe::UnixListener { | ||
fn as_raw_handle(&self) -> Handle { | ||
self.as_inner().handle() | ||
} | ||
} | ||
|
||
impl AsRawHandle for io::net::pipe::UnixAcceptor { | ||
fn as_raw_handle(&self) -> Handle { | ||
self.as_inner().handle() | ||
} | ||
} | ||
|
||
/// Extract raw sockets. | ||
pub trait AsRawSocket { | ||
fn as_raw_socket(&self) -> Socket; | ||
} | ||
|
||
impl AsRawSocket for io::net::tcp::TcpStream { | ||
fn as_raw_socket(&self) -> Socket { | ||
self.as_inner().fd() | ||
} | ||
} | ||
|
||
impl AsRawSocket for io::net::tcp::TcpListener { | ||
fn as_raw_socket(&self) -> Socket { | ||
self.as_inner().fd() | ||
} | ||
} | ||
|
||
impl AsRawSocket for io::net::tcp::TcpAcceptor { | ||
fn as_raw_socket(&self) -> Socket { | ||
self.as_inner().fd() | ||
} | ||
} | ||
|
||
impl AsRawSocket for io::net::udp::UdpSocket { | ||
fn as_raw_socket(&self) -> Socket { | ||
self.as_inner().fd() | ||
} | ||
} | ||
|
||
/// A prelude for conveniently writing platform-specific code. | ||
/// | ||
/// Includes all extension traits, and some important type definitions. | ||
pub mod prelude { | ||
pub use super::{Socket, Handle, AsRawSocket, AsRawHandle}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at aturon@1e66164
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging aturon/rust/fds = 1e66164 into auto
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
aturon/rust/fds = 1e66164 merged ok, testing candidate = d55e2e63
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2439
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at aturon@1e66164
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging aturon/rust/fds = 1e66164 into auto
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
aturon/rust/fds = 1e66164 merged ok, testing candidate = 61af402
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2455
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2452
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2445
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2452
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2446
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2445
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2445
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2449
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2442
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2441
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2444
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2106
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2102
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2108
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/945
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/939
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/934
1e66164
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 61af402