Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
f9f01efa
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f9f01efa
编写于
5月 05, 2015
作者:
S
Steven Allen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Stabilize from_raw_os
上级
6cd74861
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
13 deletion
+14
-13
src/libstd/sys/unix/ext/io.rs
src/libstd/sys/unix/ext/io.rs
+6
-6
src/libstd/sys/windows/ext/io.rs
src/libstd/sys/windows/ext/io.rs
+8
-7
未找到文件。
src/libstd/sys/unix/ext/io.rs
浏览文件 @
f9f01efa
...
...
@@ -41,8 +41,7 @@ pub trait AsRawFd {
/// A trait to express the ability to construct an object from a raw file
/// descriptor.
#[unstable(feature
=
"from_raw_os"
,
reason
=
"recent addition to std::os::unix::io"
)]
#[stable(feature
=
"from_raw_os"
,
since
=
"1.1.0"
)]
pub
trait
FromRawFd
{
/// Constructs a new instances of `Self` from the given raw file
/// descriptor.
...
...
@@ -56,6 +55,7 @@ pub trait FromRawFd {
/// descriptor they are wrapping. Usage of this function could
/// accidentally allow violating this contract which can cause memory
/// unsafety in code that relies on it being true.
#[stable(feature
=
"from_raw_os"
,
since
=
"1.1.0"
)]
unsafe
fn
from_raw_fd
(
fd
:
RawFd
)
->
Self
;
}
...
...
@@ -65,7 +65,7 @@ fn as_raw_fd(&self) -> RawFd {
self
.as_inner
()
.fd
()
.raw
()
}
}
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"trait is unstable
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
impl
FromRawFd
for
fs
::
File
{
unsafe
fn
from_raw_fd
(
fd
:
RawFd
)
->
fs
::
File
{
fs
::
File
::
from_inner
(
sys
::
fs2
::
File
::
from_inner
(
fd
))
...
...
@@ -85,21 +85,21 @@ impl AsRawFd for net::UdpSocket {
fn
as_raw_fd
(
&
self
)
->
RawFd
{
*
self
.as_inner
()
.socket
()
.as_inner
()
}
}
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"trait is unstable
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
impl
FromRawFd
for
net
::
TcpStream
{
unsafe
fn
from_raw_fd
(
fd
:
RawFd
)
->
net
::
TcpStream
{
let
socket
=
sys
::
net
::
Socket
::
from_inner
(
fd
);
net
::
TcpStream
::
from_inner
(
net2
::
TcpStream
::
from_inner
(
socket
))
}
}
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"trait is unstable
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
impl
FromRawFd
for
net
::
TcpListener
{
unsafe
fn
from_raw_fd
(
fd
:
RawFd
)
->
net
::
TcpListener
{
let
socket
=
sys
::
net
::
Socket
::
from_inner
(
fd
);
net
::
TcpListener
::
from_inner
(
net2
::
TcpListener
::
from_inner
(
socket
))
}
}
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"trait is unstable
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
impl
FromRawFd
for
net
::
UdpSocket
{
unsafe
fn
from_raw_fd
(
fd
:
RawFd
)
->
net
::
UdpSocket
{
let
socket
=
sys
::
net
::
Socket
::
from_inner
(
fd
);
...
...
src/libstd/sys/windows/ext/io.rs
浏览文件 @
f9f01efa
...
...
@@ -33,8 +33,7 @@ pub trait AsRawHandle {
}
/// Construct I/O objects from raw handles.
#[unstable(feature
=
"from_raw_os"
,
reason
=
"recent addition to the std::os::windows::io module"
)]
#[stable(feature
=
"from_raw_os"
,
since
=
"1.1.0"
)]
pub
trait
FromRawHandle
{
/// Constructs a new I/O object from the specified raw handle.
///
...
...
@@ -47,6 +46,7 @@ pub trait FromRawHandle {
/// descriptor they are wrapping. Usage of this function could
/// accidentally allow violating this contract which can cause memory
/// unsafety in code that relies on it being true.
#[stable(feature
=
"from_raw_os"
,
since
=
"1.1.0"
)]
unsafe
fn
from_raw_handle
(
handle
:
RawHandle
)
->
Self
;
}
...
...
@@ -57,7 +57,7 @@ fn as_raw_handle(&self) -> RawHandle {
}
}
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"trait is unstable
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
impl
FromRawHandle
for
fs
::
File
{
unsafe
fn
from_raw_handle
(
handle
:
RawHandle
)
->
fs
::
File
{
let
handle
=
handle
as
::
libc
::
HANDLE
;
...
...
@@ -74,7 +74,7 @@ pub trait AsRawSocket {
}
/// Create I/O objects from raw sockets.
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"recent addition to module
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
pub
trait
FromRawSocket
{
/// Creates a new I/O object from the given raw socket.
///
...
...
@@ -86,6 +86,7 @@ pub trait FromRawSocket {
/// descriptor they are wrapping. Usage of this function could
/// accidentally allow violating this contract which can cause memory
/// unsafety in code that relies on it being true.
#[stable(feature
=
"from_raw_os"
,
since
=
"1.1.0"
)]
unsafe
fn
from_raw_socket
(
sock
:
RawSocket
)
->
Self
;
}
...
...
@@ -108,21 +109,21 @@ fn as_raw_socket(&self) -> RawSocket {
}
}
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"trait is unstable
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
impl
FromRawSocket
for
net
::
TcpStream
{
unsafe
fn
from_raw_socket
(
sock
:
RawSocket
)
->
net
::
TcpStream
{
let
sock
=
sys
::
net
::
Socket
::
from_inner
(
sock
);
net
::
TcpStream
::
from_inner
(
net2
::
TcpStream
::
from_inner
(
sock
))
}
}
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"trait is unstable
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
impl
FromRawSocket
for
net
::
TcpListener
{
unsafe
fn
from_raw_socket
(
sock
:
RawSocket
)
->
net
::
TcpListener
{
let
sock
=
sys
::
net
::
Socket
::
from_inner
(
sock
);
net
::
TcpListener
::
from_inner
(
net2
::
TcpListener
::
from_inner
(
sock
))
}
}
#[
unstable(feature
=
"from_raw_os"
,
reason
=
"trait is unstable
"
)]
#[
stable(feature
=
"from_raw_os"
,
since
=
"1.1.0
"
)]
impl
FromRawSocket
for
net
::
UdpSocket
{
unsafe
fn
from_raw_socket
(
sock
:
RawSocket
)
->
net
::
UdpSocket
{
let
sock
=
sys
::
net
::
Socket
::
from_inner
(
sock
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录