Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
a92ee0f6
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,发现更多精彩内容 >>
提交
a92ee0f6
编写于
2月 19, 2016
作者:
A
Aaron Turon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Register new snapshots
上级
28a3e8bb
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
39 addition
and
81 deletion
+39
-81
src/libcollections/borrow.rs
src/libcollections/borrow.rs
+2
-2
src/libcollections/btree/map.rs
src/libcollections/btree/map.rs
+2
-2
src/libcore/intrinsics.rs
src/libcore/intrinsics.rs
+0
-3
src/libcore/option.rs
src/libcore/option.rs
+1
-1
src/libcore/result.rs
src/libcore/result.rs
+2
-2
src/libstd/collections/hash/map.rs
src/libstd/collections/hash/map.rs
+2
-2
src/libstd/env.rs
src/libstd/env.rs
+1
-1
src/libstd/io/mod.rs
src/libstd/io/mod.rs
+3
-3
src/libstd/net/addr.rs
src/libstd/net/addr.rs
+2
-2
src/libstd/net/ip.rs
src/libstd/net/ip.rs
+2
-2
src/libstd/path.rs
src/libstd/path.rs
+10
-10
src/libstd/sync/mpsc/mod.rs
src/libstd/sync/mpsc/mod.rs
+2
-2
src/libstd/sys/common/poison.rs
src/libstd/sys/common/poison.rs
+1
-1
src/libstd/sys/common/unwind/gcc.rs
src/libstd/sys/common/unwind/gcc.rs
+0
-1
src/libstd/sys/common/unwind/mod.rs
src/libstd/sys/common/unwind/mod.rs
+0
-17
src/libstd/sys/common/unwind/seh.rs
src/libstd/sys/common/unwind/seh.rs
+0
-29
src/libstd/sys/common/unwind/seh64_gnu.rs
src/libstd/sys/common/unwind/seh64_gnu.rs
+0
-1
src/snapshots.txt
src/snapshots.txt
+9
-0
未找到文件。
src/libcollections/borrow.rs
浏览文件 @
a92ee0f6
...
...
@@ -95,12 +95,12 @@ pub enum Cow<'a, B: ?Sized + 'a>
{
/// Borrowed data.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Borrowed
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
&
'a
B
),
Borrowed
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
&
'a
B
),
/// Owned data.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Owned
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
<
B
as
ToOwned
>
::
Owned
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
<
B
as
ToOwned
>
::
Owned
),
}
...
...
src/libcollections/btree/map.rs
浏览文件 @
a92ee0f6
...
...
@@ -238,13 +238,13 @@ pub enum Entry<'a, K: 'a, V: 'a> {
/// A vacant Entry
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Vacant
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
VacantEntry
<
'a
,
K
,
V
>
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
VacantEntry
<
'a
,
K
,
V
>
),
/// An occupied Entry
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Occupied
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
OccupiedEntry
<
'a
,
K
,
V
>
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
OccupiedEntry
<
'a
,
K
,
V
>
),
}
...
...
src/libcore/intrinsics.rs
浏览文件 @
a92ee0f6
...
...
@@ -559,8 +559,5 @@ pub fn volatile_copy_nonoverlapping_memory<T>(dst: *mut T, src: *const T,
/// platforms this is a `*mut *mut T` which is filled in by the compiler and
/// on MSVC it's `*mut [usize; 2]`. For more information see the compiler's
/// source as well as std's catch implementation.
#[cfg(not(stage0))]
pub
fn
try
(
f
:
fn
(
*
mut
u8
),
data
:
*
mut
u8
,
local_ptr
:
*
mut
u8
)
->
i32
;
#[cfg(stage0)]
pub
fn
try
(
f
:
fn
(
*
mut
u8
),
data
:
*
mut
u8
)
->
*
mut
u8
;
}
src/libcore/option.rs
浏览文件 @
a92ee0f6
...
...
@@ -169,7 +169,7 @@ pub enum Option<T> {
None
,
/// Some value `T`
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Some
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
T
)
Some
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
T
)
}
/////////////////////////////////////////////////////////////////////////////
...
...
src/libcore/result.rs
浏览文件 @
a92ee0f6
...
...
@@ -250,11 +250,11 @@
pub
enum
Result
<
T
,
E
>
{
/// Contains the success value
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Ok
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
T
),
Ok
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
T
),
/// Contains the error value
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Err
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
E
)
Err
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
E
)
}
/////////////////////////////////////////////////////////////////////////////
...
...
src/libstd/collections/hash/map.rs
浏览文件 @
a92ee0f6
...
...
@@ -1402,13 +1402,13 @@ pub enum Entry<'a, K: 'a, V: 'a> {
/// An occupied Entry.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Occupied
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
OccupiedEntry
<
'a
,
K
,
V
>
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
OccupiedEntry
<
'a
,
K
,
V
>
),
/// A vacant Entry.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Vacant
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
VacantEntry
<
'a
,
K
,
V
>
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
VacantEntry
<
'a
,
K
,
V
>
),
}
...
...
src/libstd/env.rs
浏览文件 @
a92ee0f6
...
...
@@ -218,7 +218,7 @@ pub enum VarError {
/// valid unicode data. The found data is returned as a payload of this
/// variant.
#[stable(feature
=
"env"
,
since
=
"1.0.0"
)]
NotUnicode
(
#[
cfg_attr(not(stage0),
stable(feature
=
"env"
,
since
=
"1.0.0"
)
)]
OsString
),
NotUnicode
(
#[
stable(feature
=
"env"
,
since
=
"1.0.0"
)]
OsString
),
}
#[stable(feature
=
"env"
,
since
=
"1.0.0"
)]
...
...
src/libstd/io/mod.rs
浏览文件 @
a92ee0f6
...
...
@@ -1175,7 +1175,7 @@ pub trait Seek {
pub
enum
SeekFrom
{
/// Set the offset to the provided number of bytes.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Start
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
u64
),
Start
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
u64
),
/// Set the offset to the size of this object plus the specified number of
/// bytes.
...
...
@@ -1183,7 +1183,7 @@ pub enum SeekFrom {
/// It is possible to seek beyond the end of an object, but it's an error to
/// seek before byte 0.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
End
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
i64
),
End
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
i64
),
/// Set the offset to the current position plus the specified number of
/// bytes.
...
...
@@ -1191,7 +1191,7 @@ pub enum SeekFrom {
/// It is possible to seek beyond the end of an object, but it's an error to
/// seek before byte 0.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Current
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
i64
),
Current
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
i64
),
}
fn
read_until
<
R
:
BufRead
+
?
Sized
>
(
r
:
&
mut
R
,
delim
:
u8
,
buf
:
&
mut
Vec
<
u8
>
)
...
...
src/libstd/net/addr.rs
浏览文件 @
a92ee0f6
...
...
@@ -32,10 +32,10 @@
pub
enum
SocketAddr
{
/// An IPv4 socket address which is a (ip, port) combination.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
V4
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
SocketAddrV4
),
V4
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
SocketAddrV4
),
/// An IPv6 socket address
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
V6
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
SocketAddrV6
),
V6
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
SocketAddrV6
),
}
/// An IPv4 socket address which is a (ip, port) combination.
...
...
src/libstd/net/ip.rs
浏览文件 @
a92ee0f6
...
...
@@ -27,10 +27,10 @@
pub
enum
IpAddr
{
/// Representation of an IPv4 address.
#[stable(feature
=
"ip_addr"
,
since
=
"1.7.0"
)]
V4
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.7.0"
)
)]
Ipv4Addr
),
V4
(
#[
stable(feature
=
"ip_addr"
,
since
=
"1.7.0"
)]
Ipv4Addr
),
/// Representation of an IPv6 address.
#[stable(feature
=
"ip_addr"
,
since
=
"1.7.0"
)]
V6
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.7.0"
)
)]
Ipv6Addr
),
V6
(
#[
stable(feature
=
"ip_addr"
,
since
=
"1.7.0"
)]
Ipv6Addr
),
}
/// Representation of an IPv4 address.
...
...
src/libstd/path.rs
浏览文件 @
a92ee0f6
...
...
@@ -268,33 +268,33 @@ fn parse_two_comps(mut path: &[u8], f: fn(u8) -> bool) -> Option<(&[u8], &[u8])>
pub enum Prefix<'a> {
/// Prefix `
\\
?
\
`, together with the given component immediately following it.
#[stable(feature = "
rust1
", since = "
1.0
.0
")]
Verbatim(#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] &'a OsStr),
Verbatim(#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] &'a OsStr),
/// Prefix `
\\
?
\
UNC
\
`, with the "
server
" and "
share
" components following it.
#[stable(feature = "
rust1
", since = "
1.0
.0
")]
VerbatimUNC(
#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] &'a OsStr,
#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] &'a OsStr,
#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] &'a OsStr,
#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] &'a OsStr,
),
/// Prefix like `
\\
?
\
C:
\
`, for the given drive letter
#[stable(feature = "
rust1
", since = "
1.0
.0
")]
VerbatimDisk(#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] u8),
VerbatimDisk(#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] u8),
/// Prefix `
\\
.
\
`, together with the given component immediately following it.
#[stable(feature = "
rust1
", since = "
1.0
.0
")]
DeviceNS(#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] &'a OsStr),
DeviceNS(#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] &'a OsStr),
/// Prefix `
\\
server
\
share`, with the given "
server
" and "
share
" components.
#[stable(feature = "
rust1
", since = "
1.0
.0
")]
UNC(
#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] &'a OsStr,
#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] &'a OsStr,
#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] &'a OsStr,
#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] &'a OsStr,
),
/// Prefix `C:` for the given disk drive.
#[stable(feature = "
rust1
", since = "
1.0
.0
")]
Disk(#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] u8),
Disk(#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] u8),
}
impl<'a> Prefix<'a> {
...
...
@@ -537,7 +537,7 @@ pub enum Component<'a> {
/// Does not occur on Unix.
#[stable(feature = "
rust1
", since = "
1.0
.0
")]
Prefix(
#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] PrefixComponent<'a>
#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] PrefixComponent<'a>
),
/// The root directory component, appears after any prefix and before anything else
...
...
@@ -554,7 +554,7 @@ pub enum Component<'a> {
/// A normal component, i.e. `a` and `b` in `a/b`
#[stable(feature = "
rust1
", since = "
1.0
.0
")]
Normal(#[
cfg_attr(not(stage0), stable(feature = "
rust1
", since = "
1.0
.0
")
)] &'a OsStr),
Normal(#[
stable(feature = "
rust1
", since = "
1.0
.0
"
)] &'a OsStr),
}
impl<'a> Component<'a> {
...
...
src/libstd/sync/mpsc/mod.rs
浏览文件 @
a92ee0f6
...
...
@@ -385,12 +385,12 @@ pub enum TrySendError<T> {
/// this is not a buffered channel, then there is no receiver available to
/// acquire the data.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Full
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
T
),
Full
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
T
),
/// This channel's receiving half has disconnected, so the data could not be
/// sent. The data is returned back to the callee in this case.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Disconnected
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
T
),
Disconnected
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
T
),
}
enum
Flavor
<
T
>
{
...
...
src/libstd/sys/common/poison.rs
浏览文件 @
a92ee0f6
...
...
@@ -71,7 +71,7 @@ pub enum TryLockError<T> {
/// The lock could not be acquired because another thread failed while holding
/// the lock.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
Poisoned
(
#[
cfg_attr(not(stage0),
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)
)]
PoisonError
<
T
>
),
Poisoned
(
#[
stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
PoisonError
<
T
>
),
/// The lock could not be acquired at this time because the operation would
/// otherwise block.
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
...
...
src/libstd/sys/common/unwind/gcc.rs
浏览文件 @
a92ee0f6
...
...
@@ -41,7 +41,6 @@ pub unsafe fn panic(data: Box<Any + Send + 'static>) -> ! {
}
}
#[cfg(not(stage0))]
pub
fn
payload
()
->
*
mut
u8
{
0
as
*
mut
u8
}
...
...
src/libstd/sys/common/unwind/mod.rs
浏览文件 @
a92ee0f6
...
...
@@ -128,7 +128,6 @@ fn try_fn<F: FnOnce()>(opt_closure: *mut u8) {
}
}
#[cfg(not(stage0))]
unsafe
fn
inner_try
(
f
:
fn
(
*
mut
u8
),
data
:
*
mut
u8
)
->
Result
<
(),
Box
<
Any
+
Send
>>
{
PANIC_COUNT
.with
(|
s
|
{
...
...
@@ -156,22 +155,6 @@ unsafe fn inner_try(f: fn(*mut u8), data: *mut u8)
})
}
#[cfg(stage0)]
unsafe
fn
inner_try
(
f
:
fn
(
*
mut
u8
),
data
:
*
mut
u8
)
->
Result
<
(),
Box
<
Any
+
Send
>>
{
PANIC_COUNT
.with
(|
s
|
{
let
prev
=
s
.get
();
s
.set
(
0
);
let
ep
=
intrinsics
::
try
(
f
,
data
);
s
.set
(
prev
);
if
ep
.is_null
()
{
Ok
(())
}
else
{
Err
(
imp
::
cleanup
(
ep
))
}
})
}
/// Determines whether the current thread is unwinding because of panic.
pub
fn
panicking
()
->
bool
{
PANIC_COUNT
.with
(|
s
|
s
.get
()
!=
0
)
...
...
src/libstd/sys/common/unwind/seh.rs
浏览文件 @
a92ee0f6
...
...
@@ -65,35 +65,6 @@
pub
use
self
::
imp
::
*
;
#[cfg(stage0)]
mod
imp
{
use
prelude
::
v1
::
*
;
use
any
::
Any
;
pub
unsafe
fn
panic
(
_
data
:
Box
<
Any
+
Send
+
'static
>
)
->
!
{
rtabort!
(
"cannot unwind SEH in stage0"
)
}
pub
unsafe
fn
cleanup
(
_
ptr
:
*
mut
u8
)
->
Box
<
Any
+
Send
+
'static
>
{
rtabort!
(
"can't cleanup SEH in stage0"
)
}
#[lang
=
"msvc_try_filter"
]
#[linkage
=
"external"
]
unsafe
extern
fn
__
rust_try_filter
()
->
i32
{
0
}
#[lang
=
"eh_unwind_resume"
]
#[unwind]
unsafe
extern
fn
rust_eh_unwind_resume
(
_
ptr
:
*
mut
u8
)
->
!
{
rtabort!
(
"can't resume unwind SEH in stage0"
)
}
#[lang
=
"eh_personality_catch"
]
unsafe
extern
fn
rust_eh_personality_catch
()
{}
}
#[cfg(not(stage0))]
mod
imp
{
use
prelude
::
v1
::
*
;
...
...
src/libstd/sys/common/unwind/seh64_gnu.rs
浏览文件 @
a92ee0f6
...
...
@@ -50,7 +50,6 @@ pub unsafe fn panic(data: Box<Any + Send + 'static>) -> ! {
rtabort!
(
"could not unwind stack"
);
}
#[cfg(not(stage0))]
pub
fn
payload
()
->
*
mut
u8
{
0
as
*
mut
u8
}
...
...
src/snapshots.txt
浏览文件 @
a92ee0f6
S 2016-02-17 4d3eebf
linux-i386 5f194aa7628c0703f0fd48adc4ec7f3cc64b98c7
linux-x86_64 d29b7607d13d64078b6324aec82926fb493f59ba
macos-i386 4c8e42dd649e247f3576bf9dfa273327b4907f9c
macos-x86_64 411a41363f922d1d93fa62ff2fedf5c35e9cccb2
winnt-i386 0c336d794a65f8e285c121866c7d59aa2dd0d1e1
winnt-x86_64 27e75b1bf99770b3564bcebd7f3230be01135a92
openbsd-x86_64 ac957c6b84de2bd67f01df085d9ea515f96e22f3
S 2015-12-18 3391630
bitrig-x86_64 6476e1562df02389b55553b4c88b1f4fd121cd40
freebsd-i386 7e624c50494402e1feb14c743d659fbd71b448f5
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录