Skip to content

Commit abdacec

Browse files
committed
auto merge of #13930 : alexcrichton/rust/snapshots, r=huonw
cc @pcwalton and @flaper87, this has box expressions and opt-in builtin kinds.
2 parents 3179cd5 + 877f09b commit abdacec

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

src/libstd/intrinsics.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ pub trait TyVisitor {
9595

9696
fn visit_f32(&mut self) -> bool;
9797
fn visit_f64(&mut self) -> bool;
98-
#[cfg(not(stage0))]
9998
fn visit_f128(&mut self) -> bool;
10099

101100
fn visit_char(&mut self) -> bool;
@@ -341,21 +340,18 @@ extern "rust-intrinsic" {
341340
/// `min_align_of::<T>()`
342341
///
343342
/// The volatile parameter parameter is set to `true`, so it will not be optimized out.
344-
#[cfg(not(stage0))]
345343
pub fn volatile_copy_nonoverlapping_memory<T>(dst: *mut T, src: *T, count: uint);
346344
/// Equivalent to the appropriate `llvm.memmove.p0i8.0i8.*` intrinsic, with
347345
/// a size of `count` * `size_of::<T>()` and an alignment of
348346
/// `min_align_of::<T>()`
349347
///
350348
/// The volatile parameter parameter is set to `true`, so it will not be optimized out.
351-
#[cfg(not(stage0))]
352349
pub fn volatile_copy_memory<T>(dst: *mut T, src: *T, count: uint);
353350
/// Equivalent to the appropriate `llvm.memset.p0i8.*` intrinsic, with a
354351
/// size of `count` * `size_of::<T>()` and an alignment of
355352
/// `min_align_of::<T>()`.
356353
///
357354
/// The volatile parameter parameter is set to `true`, so it will not be optimized out.
358-
#[cfg(not(stage0))]
359355
pub fn volatile_set_memory<T>(dst: *mut T, val: u8, count: uint);
360356

361357
/// Perform a volatile load from the `src` pointer.

src/libstd/reflect.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
176176
true
177177
}
178178

179-
#[cfg(not(stage0))]
180179
fn visit_f128(&mut self) -> bool {
181180
self.align_to::<f128>();
182181
if ! self.inner.visit_f128() { return false; }

src/libstd/repr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
280280

281281
fn visit_f32(&mut self) -> bool { self.write::<f32>() }
282282
fn visit_f64(&mut self) -> bool { self.write::<f64>() }
283-
#[cfg(not(stage0))]
284283
fn visit_f128(&mut self) -> bool { fail!("not implemented") }
285284

286285
fn visit_char(&mut self) -> bool {

src/snapshots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2014-05-04 922c420
2+
freebsd-x86_64 635f28dd48340db0c1cdc01adad18866acfc7020
3+
linux-i386 360a40acf713e6f2d7fcde0112ae87d8336f320c
4+
linux-x86_64 a6dfa69483824d525180ac6040b59beed7df165b
5+
macos-i386 75e466423e2183e57a5f02358c6f9210997eae94
6+
macos-x86_64 12575c620e163002f6d30d1843564eeae31de7b9
7+
winnt-i386 be45073b14691e2b0aa9181d4238cbc310f5ae58
8+
19
S 2014-04-23 b5dd3f0
210
freebsd-x86_64 b6ccb045b9bea4cc4781bc128e047a1c68dc2c17
311
linux-i386 9e4e8d2bc70ff5b8db21169f762cb20c4dba6c2c

src/test/compile-fail/deriving-bounds.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
//NOTE: Remove in the next snapshot
12-
#[cfg(not(stage0))]
1311
#[deriving(Share(Bad),Send,Copy)]
1412
//~^ ERROR unexpected value in deriving, expected a trait
1513
struct Test;

src/test/run-pass/deriving-bounds.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
//NOTE: Remove in the next snapshot
12-
#[cfg(not(stage0))]
1311
#[deriving(Share,Send,Copy)]
1412
struct Test;
1513

0 commit comments

Comments
 (0)