Skip to content

Commit

Permalink
auto merge of #16531 : alexcrichton/rust/snapshots, r=luqmana
Browse files Browse the repository at this point in the history
Hopefully this will fix #16489!
  • Loading branch information
bors committed Aug 16, 2014
2 parents 17bcc1b + 8f16aa7 commit 85fd37f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/libcore/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ extern "rust-intrinsic" {
///
/// Using this instrinsic in a function that does not use an out pointer
/// will trigger a compiler error.
#[cfg(not(stage0))]
pub fn return_address() -> *const u8;

/// Returns `true` if a type requires drop glue.
Expand Down
7 changes: 0 additions & 7 deletions src/libcore/kinds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,6 @@ pub trait Copy {
/// reference; not doing this is undefined behaviour (for example,
/// `transmute`-ing from `&T` to `&mut T` is illegal).
#[lang="sync"]
#[cfg(not(stage0))]
pub trait Sync {
// Empty
}
/// dox
#[lang="share"]
#[cfg(stage0)]
pub trait Sync {
// Empty
}
Expand Down
8 changes: 8 additions & 0 deletions src/snapshots.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
S 2014-08-14 aa98b25
freebsd-x86_64 6a84283dfd8600fca6ec08144228f405ad9fe333
linux-i386 6aeac588b086a99f81b53cfadd15617c82c540aa
linux-x86_64 0efd0a8516affe0b1c6bf2e02e08ceff0f9c3a1d
macos-i386 4b2535d247d24869ef00942f80a5a1bd17cafedb
macos-x86_64 7b88a4aa4e424a5cb3b6d978132591ea54e9589d
winnt-i386 19b86f3c413f07363726fb6bf086307ed14fdae2

S 2014-08-07 12e0f72
freebsd-x86_64 e55055a876ebbde0d3ed3bcb97579afab9264def
linux-i386 2665e45879f2ef77ce0c9015f971642fe424ac33
Expand Down

0 comments on commit 85fd37f

Please sign in to comment.