Skip to content

Commit 52769b6

Browse files
committed
auto merge of #11050 : alexcrichton/rust/snapshots, r=brson
Time for a visit from the snapshot fairy!
2 parents b760ed6 + d4825b9 commit 52769b6

File tree

4 files changed

+9
-41
lines changed

4 files changed

+9
-41
lines changed

src/libstd/cell.rs

-35
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,13 @@ use prelude::*;
1414
use cast;
1515
use util::NonCopyable;
1616

17-
#[cfg(stage0)]
18-
use unstable::intrinsics;
19-
2017
/// A mutable memory location that admits only `Pod` data.
2118
#[no_freeze]
2219
#[deriving(Clone)]
2320
pub struct Cell<T> {
2421
priv value: T,
2522
}
2623

27-
// NB: For `stage0`, we omit the `Pod` bound. This is unsound but will help
28-
// us get started on removing `@mut` from `rustc`.
29-
30-
#[cfg(stage0)]
31-
impl<T> Cell<T> {
32-
/// Creates a new `Cell` containing the given value.
33-
pub fn new(value: T) -> Cell<T> {
34-
Cell {
35-
value: value,
36-
}
37-
}
38-
39-
/// Returns a copy of the contained value.
40-
#[inline]
41-
pub fn get(&self) -> T {
42-
unsafe {
43-
let mut result = intrinsics::uninit();
44-
intrinsics::copy_nonoverlapping_memory(&mut result, &self.value, 1);
45-
result
46-
}
47-
}
48-
49-
/// Sets the contained value.
50-
#[inline]
51-
pub fn set(&self, value: T) {
52-
unsafe {
53-
intrinsics::copy_nonoverlapping_memory(cast::transmute_mut(&self.value), &value, 1)
54-
}
55-
}
56-
}
57-
58-
#[cfg(not(stage0))]
5924
impl<T: ::kinds::Pod> Cell<T> {
6025
/// Creates a new `Cell` containing the given value.
6126
pub fn new(value: T) -> Cell<T> {

src/libstd/kinds.rs

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ pub trait Sized {
4141
/// Types that can be copied by simply copying bits (i.e. `memcpy`).
4242
///
4343
/// The name "POD" stands for "Plain Old Data" and is borrowed from C++.
44-
#[cfg(not(stage0))]
4544
#[lang="pod"]
4645
pub trait Pod {
4746
// Empty.

src/libstd/prelude.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,14 @@ Rust's prelude has three main parts:
2828

2929
// Reexported core operators
3030
pub use either::{Either, Left, Right};
31-
pub use kinds::Sized;
32-
pub use kinds::{Freeze, Send};
31+
pub use kinds::{Freeze, Pod, Send, Sized};
3332
pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not};
3433
pub use ops::{BitAnd, BitOr, BitXor};
3534
pub use ops::{Drop};
3635
pub use ops::{Shl, Shr, Index};
3736
pub use option::{Option, Some, None};
3837
pub use result::{Result, Ok, Err};
3938

40-
#[cfg(not(stage0))]
41-
pub use kinds::Pod;
42-
4339
// Reexported functions
4440
pub use from_str::from_str;
4541
pub use iter::range;

src/snapshots.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2013-12-17 d5798b3
2+
freebsd-x86_64 8f71dbd1aef6c59867ce6287cc82c6033e1ee5e5
3+
linux-i386 3a6e8950ef704ec57ab690b30beda19d7a63a537
4+
linux-x86_64 dc6cab75e98b6ca77ba7792aa39eda5875741d93
5+
macos-i386 ec9f8fd4b2f47f4160ed674350c70560a0cf5bb8
6+
macos-x86_64 ebae3ac1c05b42031e5f2859cd9c499dc644f8b1
7+
winnt-i386 4419876bcd00c1b75df7d86381aff4c0617030f7
8+
19
S 2013-12-10 b8b16ae
210
freebsd-x86_64 08d28a3a47f4263dc0a005374e59d30b1b942ab2
311
linux-i386 4cd5d8b80014a69dea9744fd12c8cdab6269d263

0 commit comments

Comments
 (0)