Skip to content

Commit 85fd37f

Browse files
committed
auto merge of rust-lang#16531 : alexcrichton/rust/snapshots, r=luqmana
Hopefully this will fix rust-lang#16489!
2 parents 17bcc1b + 8f16aa7 commit 85fd37f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/libcore/intrinsics.rs

-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ extern "rust-intrinsic" {
314314
///
315315
/// Using this instrinsic in a function that does not use an out pointer
316316
/// will trigger a compiler error.
317-
#[cfg(not(stage0))]
318317
pub fn return_address() -> *const u8;
319318

320319
/// Returns `true` if a type requires drop glue.

src/libcore/kinds.rs

-7
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,6 @@ pub trait Copy {
8787
/// reference; not doing this is undefined behaviour (for example,
8888
/// `transmute`-ing from `&T` to `&mut T` is illegal).
8989
#[lang="sync"]
90-
#[cfg(not(stage0))]
91-
pub trait Sync {
92-
// Empty
93-
}
94-
/// dox
95-
#[lang="share"]
96-
#[cfg(stage0)]
9790
pub trait Sync {
9891
// Empty
9992
}

src/snapshots.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2014-08-14 aa98b25
2+
freebsd-x86_64 6a84283dfd8600fca6ec08144228f405ad9fe333
3+
linux-i386 6aeac588b086a99f81b53cfadd15617c82c540aa
4+
linux-x86_64 0efd0a8516affe0b1c6bf2e02e08ceff0f9c3a1d
5+
macos-i386 4b2535d247d24869ef00942f80a5a1bd17cafedb
6+
macos-x86_64 7b88a4aa4e424a5cb3b6d978132591ea54e9589d
7+
winnt-i386 19b86f3c413f07363726fb6bf086307ed14fdae2
8+
19
S 2014-08-07 12e0f72
210
freebsd-x86_64 e55055a876ebbde0d3ed3bcb97579afab9264def
311
linux-i386 2665e45879f2ef77ce0c9015f971642fe424ac33

0 commit comments

Comments
 (0)