diff options
| author | bors <bors@rust-lang.org> | 2015-07-28 08:51:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-28 08:51:21 +0000 |
| commit | 5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9 (patch) | |
| tree | 5e0ce03e0e08c453eb3c8c8f470553c6cda98263 /src/libcore | |
| parent | 79d5fefa2508212ec2cc46c1069819a988f23598 (diff) | |
| parent | cc09b1a08cc61dd3f485308adf3a5a252c718861 (diff) | |
| download | rust-5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9.tar.gz rust-5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9.zip | |
Auto merge of #27309 - eddyb:snapshot-infdef, r=alexcrichton
FreeBSD i386 snapshot is missing, failed tests (possibly spurious). r? @alexcrichton
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/intrinsics.rs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index 1d466895f2c..80b7587ed36 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -184,19 +184,11 @@ extern "rust-intrinsic" { /// elements. pub fn size_of<T>() -> usize; - #[cfg(not(stage0))] /// Moves a value to an uninitialized memory location. /// /// Drop glue is not run on the destination. pub fn move_val_init<T>(dst: *mut T, src: T); - // SNAP d4432b3 - #[cfg(stage0)] - /// Moves a value to an uninitialized memory location. - /// - /// Drop glue is not run on the destination. - pub fn move_val_init<T>(dst: &mut T, src: T); - pub fn min_align_of<T>() -> usize; pub fn pref_align_of<T>() -> usize; @@ -614,6 +606,5 @@ extern "rust-intrinsic" { /// Rust's "try catch" construct which invokes the function pointer `f` with /// the data pointer `data`, returning the exception payload if an exception /// is thrown (aka the thread panics). - #[cfg(not(stage0))] pub fn try(f: fn(*mut u8), data: *mut u8) -> *mut u8; } |
