Skip to content

Commit e1e2877

Browse files
committed
---
yaml --- r: 150190 b: refs/heads/try2 c: b4ddee6 h: refs/heads/master v: v3
1 parent 4b94fc7 commit e1e2877

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 034e1382af9863f2bdb8b19a83521ebb784db794
8+
refs/heads/try2: b4ddee6327eadbc6ef3cfb75d272f490259a4257
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/kinds.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ pub trait Send {
2626
// empty.
2727
}
2828

29-
/// Types that are either immutable or have inherited mutability.
30-
#[lang="freeze"]
31-
pub trait Freeze {
32-
// empty.
33-
}
34-
3529
/// Types with a constant size known at compile-time.
3630
#[lang="sized"]
3731
pub trait Sized {
@@ -225,14 +219,6 @@ pub mod marker {
225219
#[deriving(Eq,Clone)]
226220
pub struct InvariantLifetime<'a>;
227221

228-
/// A type which is considered "not freezable", meaning that
229-
/// its contents could change even if stored in an immutable
230-
/// context or it is the referent of an `&T` pointer. This is
231-
/// typically embedded in other types, such as `Cell`.
232-
#[lang="no_freeze_bound"]
233-
#[deriving(Eq,Clone)]
234-
pub struct NoFreeze;
235-
236222
/// A type which is considered "not sendable", meaning that it cannot
237223
/// be safely sent between tasks, even if it is owned. This is
238224
/// typically embedded in other types, such as `Gc`, to ensure that

branches/try2/src/libstd/prelude.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ generally useful to many Rust programs.
2020
*/
2121

2222
// Reexported core operators
23-
pub use kinds::{Freeze, Pod, Send, Sized, Share};
23+
pub use kinds::{Pod, Send, Sized, Share};
2424
pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not};
2525
pub use ops::{BitAnd, BitOr, BitXor};
2626
pub use ops::{Drop, Deref, DerefMut};

0 commit comments

Comments
 (0)