Skip to content

Commit 304c790

Browse files
borsbors
committed
Auto merge of #31778 - aturon:snapshot, r=alexcrichton
r? @alexcrichton
2 parents a4574bd + a92ee0f commit 304c790

File tree

18 files changed

+39
-81
lines changed

18 files changed

+39
-81
lines changed

‎src/libcollections/borrow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ pub enum Cow<'a, B: ?Sized + 'a>
9595
{
9696
/// Borrowed data.
9797
#[stable(feature = "rust1", since = "1.0.0")]
98-
Borrowed(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] &'a B),
98+
Borrowed(#[stable(feature = "rust1", since = "1.0.0")] &'a B),
9999

100100
/// Owned data.
101101
#[stable(feature = "rust1", since = "1.0.0")]
102102
Owned(
103-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] <B as ToOwned>::Owned
103+
#[stable(feature = "rust1", since = "1.0.0")] <B as ToOwned>::Owned
104104
),
105105
}
106106

‎src/libcollections/btree/map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,13 @@ pub enum Entry<'a, K: 'a, V: 'a> {
238238
/// A vacant Entry
239239
#[stable(feature = "rust1", since = "1.0.0")]
240240
Vacant(
241-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] VacantEntry<'a, K, V>
241+
#[stable(feature = "rust1", since = "1.0.0")] VacantEntry<'a, K, V>
242242
),
243243

244244
/// An occupied Entry
245245
#[stable(feature = "rust1", since = "1.0.0")]
246246
Occupied(
247-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] OccupiedEntry<'a, K, V>
247+
#[stable(feature = "rust1", since = "1.0.0")] OccupiedEntry<'a, K, V>
248248
),
249249
}
250250

‎src/libcore/intrinsics.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,8 +586,5 @@ extern "rust-intrinsic" {
586586
/// platforms this is a `*mut *mut T` which is filled in by the compiler and
587587
/// on MSVC it's `*mut [usize; 2]`. For more information see the compiler's
588588
/// source as well as std's catch implementation.
589-
#[cfg(not(stage0))]
590589
pub fn try(f: fn(*mut u8), data: *mut u8, local_ptr: *mut u8) -> i32;
591-
#[cfg(stage0)]
592-
pub fn try(f: fn(*mut u8), data: *mut u8) -> *mut u8;
593590
}

‎src/libcore/option.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub enum Option<T> {
169169
None,
170170
/// Some value `T`
171171
#[stable(feature = "rust1", since = "1.0.0")]
172-
Some(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] T)
172+
Some(#[stable(feature = "rust1", since = "1.0.0")] T)
173173
}
174174

175175
/////////////////////////////////////////////////////////////////////////////

‎src/libcore/result.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@ use option::Option::{self, None, Some};
250250
pub enum Result<T, E> {
251251
/// Contains the success value
252252
#[stable(feature = "rust1", since = "1.0.0")]
253-
Ok(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] T),
253+
Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
254254

255255
/// Contains the error value
256256
#[stable(feature = "rust1", since = "1.0.0")]
257-
Err(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] E)
257+
Err(#[stable(feature = "rust1", since = "1.0.0")] E)
258258
}
259259

260260
/////////////////////////////////////////////////////////////////////////////

‎src/libstd/collections/hash/map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,13 +1402,13 @@ pub enum Entry<'a, K: 'a, V: 'a> {
14021402
/// An occupied Entry.
14031403
#[stable(feature = "rust1", since = "1.0.0")]
14041404
Occupied(
1405-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] OccupiedEntry<'a, K, V>
1405+
#[stable(feature = "rust1", since = "1.0.0")] OccupiedEntry<'a, K, V>
14061406
),
14071407

14081408
/// A vacant Entry.
14091409
#[stable(feature = "rust1", since = "1.0.0")]
14101410
Vacant(
1411-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] VacantEntry<'a, K, V>
1411+
#[stable(feature = "rust1", since = "1.0.0")] VacantEntry<'a, K, V>
14121412
),
14131413
}
14141414

‎src/libstd/env.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ pub enum VarError {
218218
/// valid unicode data. The found data is returned as a payload of this
219219
/// variant.
220220
#[stable(feature = "env", since = "1.0.0")]
221-
NotUnicode(#[cfg_attr(not(stage0), stable(feature = "env", since = "1.0.0"))] OsString),
221+
NotUnicode(#[stable(feature = "env", since = "1.0.0")] OsString),
222222
}
223223

224224
#[stable(feature = "env", since = "1.0.0")]

‎src/libstd/io/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,23 +1175,23 @@ pub trait Seek {
11751175
pub enum SeekFrom {
11761176
/// Set the offset to the provided number of bytes.
11771177
#[stable(feature = "rust1", since = "1.0.0")]
1178-
Start(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] u64),
1178+
Start(#[stable(feature = "rust1", since = "1.0.0")] u64),
11791179

11801180
/// Set the offset to the size of this object plus the specified number of
11811181
/// bytes.
11821182
///
11831183
/// It is possible to seek beyond the end of an object, but it's an error to
11841184
/// seek before byte 0.
11851185
#[stable(feature = "rust1", since = "1.0.0")]
1186-
End(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] i64),
1186+
End(#[stable(feature = "rust1", since = "1.0.0")] i64),
11871187

11881188
/// Set the offset to the current position plus the specified number of
11891189
/// bytes.
11901190
///
11911191
/// It is possible to seek beyond the end of an object, but it's an error to
11921192
/// seek before byte 0.
11931193
#[stable(feature = "rust1", since = "1.0.0")]
1194-
Current(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] i64),
1194+
Current(#[stable(feature = "rust1", since = "1.0.0")] i64),
11951195
}
11961196

11971197
fn read_until<R: BufRead + ?Sized>(r: &mut R, delim: u8, buf: &mut Vec<u8>)

‎src/libstd/net/addr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ use slice;
3232
pub enum SocketAddr {
3333
/// An IPv4 socket address which is a (ip, port) combination.
3434
#[stable(feature = "rust1", since = "1.0.0")]
35-
V4(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] SocketAddrV4),
35+
V4(#[stable(feature = "rust1", since = "1.0.0")] SocketAddrV4),
3636
/// An IPv6 socket address
3737
#[stable(feature = "rust1", since = "1.0.0")]
38-
V6(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] SocketAddrV6),
38+
V6(#[stable(feature = "rust1", since = "1.0.0")] SocketAddrV6),
3939
}
4040

4141
/// An IPv4 socket address which is a (ip, port) combination.

‎src/libstd/net/ip.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ use sys_common::{AsInner, FromInner};
2727
pub enum IpAddr {
2828
/// Representation of an IPv4 address.
2929
#[stable(feature = "ip_addr", since = "1.7.0")]
30-
V4(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.7.0"))] Ipv4Addr),
30+
V4(#[stable(feature = "ip_addr", since = "1.7.0")] Ipv4Addr),
3131
/// Representation of an IPv6 address.
3232
#[stable(feature = "ip_addr", since = "1.7.0")]
33-
V6(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.7.0"))] Ipv6Addr),
33+
V6(#[stable(feature = "ip_addr", since = "1.7.0")] Ipv6Addr),
3434
}
3535

3636
/// Representation of an IPv4 address.

‎src/libstd/path.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -268,33 +268,33 @@ mod platform {
268268
pub enum Prefix<'a> {
269269
/// Prefix `\\?\`, together with the given component immediately following it.
270270
#[stable(feature = "rust1", since = "1.0.0")]
271-
Verbatim(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] &'a OsStr),
271+
Verbatim(#[stable(feature = "rust1", since = "1.0.0")] &'a OsStr),
272272

273273
/// Prefix `\\?\UNC\`, with the "server" and "share" components following it.
274274
#[stable(feature = "rust1", since = "1.0.0")]
275275
VerbatimUNC(
276-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] &'a OsStr,
277-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] &'a OsStr,
276+
#[stable(feature = "rust1", since = "1.0.0")] &'a OsStr,
277+
#[stable(feature = "rust1", since = "1.0.0")] &'a OsStr,
278278
),
279279

280280
/// Prefix like `\\?\C:\`, for the given drive letter
281281
#[stable(feature = "rust1", since = "1.0.0")]
282-
VerbatimDisk(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] u8),
282+
VerbatimDisk(#[stable(feature = "rust1", since = "1.0.0")] u8),
283283

284284
/// Prefix `\\.\`, together with the given component immediately following it.
285285
#[stable(feature = "rust1", since = "1.0.0")]
286-
DeviceNS(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] &'a OsStr),
286+
DeviceNS(#[stable(feature = "rust1", since = "1.0.0")] &'a OsStr),
287287

288288
/// Prefix `\\server\share`, with the given "server" and "share" components.
289289
#[stable(feature = "rust1", since = "1.0.0")]
290290
UNC(
291-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] &'a OsStr,
292-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] &'a OsStr,
291+
#[stable(feature = "rust1", since = "1.0.0")] &'a OsStr,
292+
#[stable(feature = "rust1", since = "1.0.0")] &'a OsStr,
293293
),
294294

295295
/// Prefix `C:` for the given disk drive.
296296
#[stable(feature = "rust1", since = "1.0.0")]
297-
Disk(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] u8),
297+
Disk(#[stable(feature = "rust1", since = "1.0.0")] u8),
298298
}
299299

300300
impl<'a> Prefix<'a> {
@@ -537,7 +537,7 @@ pub enum Component<'a> {
537537
/// Does not occur on Unix.
538538
#[stable(feature = "rust1", since = "1.0.0")]
539539
Prefix(
540-
#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] PrefixComponent<'a>
540+
#[stable(feature = "rust1", since = "1.0.0")] PrefixComponent<'a>
541541
),
542542

543543
/// The root directory component, appears after any prefix and before anything else
@@ -554,7 +554,7 @@ pub enum Component<'a> {
554554

555555
/// A normal component, i.e. `a` and `b` in `a/b`
556556
#[stable(feature = "rust1", since = "1.0.0")]
557-
Normal(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] &'a OsStr),
557+
Normal(#[stable(feature = "rust1", since = "1.0.0")] &'a OsStr),
558558
}
559559

560560
impl<'a> Component<'a> {

‎src/libstd/sync/mpsc/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,12 @@ pub enum TrySendError<T> {
385385
/// this is not a buffered channel, then there is no receiver available to
386386
/// acquire the data.
387387
#[stable(feature = "rust1", since = "1.0.0")]
388-
Full(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] T),
388+
Full(#[stable(feature = "rust1", since = "1.0.0")] T),
389389

390390
/// This channel's receiving half has disconnected, so the data could not be
391391
/// sent. The data is returned back to the callee in this case.
392392
#[stable(feature = "rust1", since = "1.0.0")]
393-
Disconnected(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] T),
393+
Disconnected(#[stable(feature = "rust1", since = "1.0.0")] T),
394394
}
395395

396396
enum Flavor<T> {

‎src/libstd/sys/common/poison.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ pub enum TryLockError<T> {
7171
/// The lock could not be acquired because another thread failed while holding
7272
/// the lock.
7373
#[stable(feature = "rust1", since = "1.0.0")]
74-
Poisoned(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] PoisonError<T>),
74+
Poisoned(#[stable(feature = "rust1", since = "1.0.0")] PoisonError<T>),
7575
/// The lock could not be acquired at this time because the operation would
7676
/// otherwise block.
7777
#[stable(feature = "rust1", since = "1.0.0")]

‎src/libstd/sys/common/unwind/gcc.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ pub unsafe fn panic(data: Box<Any + Send + 'static>) -> ! {
4141
}
4242
}
4343

44-
#[cfg(not(stage0))]
4544
pub fn payload() -> *mut u8 {
4645
0 as *mut u8
4746
}

‎src/libstd/sys/common/unwind/mod.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ pub unsafe fn try<F: FnOnce()>(f: F) -> Result<(), Box<Any + Send>> {
128128
}
129129
}
130130

131-
#[cfg(not(stage0))]
132131
unsafe fn inner_try(f: fn(*mut u8), data: *mut u8)
133132
-> Result<(), Box<Any + Send>> {
134133
PANIC_COUNT.with(|s| {
@@ -156,22 +155,6 @@ unsafe fn inner_try(f: fn(*mut u8), data: *mut u8)
156155
})
157156
}
158157

159-
#[cfg(stage0)]
160-
unsafe fn inner_try(f: fn(*mut u8), data: *mut u8)
161-
-> Result<(), Box<Any + Send>> {
162-
PANIC_COUNT.with(|s| {
163-
let prev = s.get();
164-
s.set(0);
165-
let ep = intrinsics::try(f, data);
166-
s.set(prev);
167-
if ep.is_null() {
168-
Ok(())
169-
} else {
170-
Err(imp::cleanup(ep))
171-
}
172-
})
173-
}
174-
175158
/// Determines whether the current thread is unwinding because of panic.
176159
pub fn panicking() -> bool {
177160
PANIC_COUNT.with(|s| s.get() != 0)

‎src/libstd/sys/common/unwind/seh.rs

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,6 @@ const RUST_PANIC: c::DWORD = 0x00525354;
6565

6666
pub use self::imp::*;
6767

68-
#[cfg(stage0)]
69-
mod imp {
70-
use prelude::v1::*;
71-
use any::Any;
72-
73-
pub unsafe fn panic(_data: Box<Any + Send + 'static>) -> ! {
74-
rtabort!("cannot unwind SEH in stage0")
75-
}
76-
77-
pub unsafe fn cleanup(_ptr: *mut u8) -> Box<Any + Send + 'static> {
78-
rtabort!("can't cleanup SEH in stage0")
79-
}
80-
81-
#[lang = "msvc_try_filter"]
82-
#[linkage = "external"]
83-
unsafe extern fn __rust_try_filter() -> i32 {
84-
0
85-
}
86-
87-
#[lang = "eh_unwind_resume"]
88-
#[unwind]
89-
unsafe extern fn rust_eh_unwind_resume(_ptr: *mut u8) -> ! {
90-
rtabort!("can't resume unwind SEH in stage0")
91-
}
92-
#[lang = "eh_personality_catch"]
93-
unsafe extern fn rust_eh_personality_catch() {}
94-
}
95-
96-
#[cfg(not(stage0))]
9768
mod imp {
9869
use prelude::v1::*;
9970

‎src/libstd/sys/common/unwind/seh64_gnu.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ pub unsafe fn panic(data: Box<Any + Send + 'static>) -> ! {
5050
rtabort!("could not unwind stack");
5151
}
5252

53-
#[cfg(not(stage0))]
5453
pub fn payload() -> *mut u8 {
5554
0 as *mut u8
5655
}

‎src/snapshots.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
S 2016-02-17 4d3eebf
2+
linux-i386 5f194aa7628c0703f0fd48adc4ec7f3cc64b98c7
3+
linux-x86_64 d29b7607d13d64078b6324aec82926fb493f59ba
4+
macos-i386 4c8e42dd649e247f3576bf9dfa273327b4907f9c
5+
macos-x86_64 411a41363f922d1d93fa62ff2fedf5c35e9cccb2
6+
winnt-i386 0c336d794a65f8e285c121866c7d59aa2dd0d1e1
7+
winnt-x86_64 27e75b1bf99770b3564bcebd7f3230be01135a92
8+
openbsd-x86_64 ac957c6b84de2bd67f01df085d9ea515f96e22f3
9+
110
S 2015-12-18 3391630
211
bitrig-x86_64 6476e1562df02389b55553b4c88b1f4fd121cd40
312
freebsd-i386 7e624c50494402e1feb14c743d659fbd71b448f5

0 commit comments

Comments
 (0)