about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorFlavio Percoco <flaper87@gmail.com>2014-03-21 23:49:19 +0100
committerFlavio Percoco <flaper87@gmail.com>2014-03-22 15:47:34 +0100
commitb4ddee6327eadbc6ef3cfb75d272f490259a4257 (patch)
tree0e0af424e41a3f256a971ad66573e5ea9100d993 /src/libstd
parent034e1382af9863f2bdb8b19a83521ebb784db794 (diff)
downloadrust-b4ddee6327eadbc6ef3cfb75d272f490259a4257.tar.gz
rust-b4ddee6327eadbc6ef3cfb75d272f490259a4257.zip
std: Remove the Freeze kind and the NoFreeze marker
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/kinds.rs14
-rw-r--r--src/libstd/prelude.rs2
2 files changed, 1 insertions, 15 deletions
diff --git a/src/libstd/kinds.rs b/src/libstd/kinds.rs
index b44616421d1..c0a442a6141 100644
--- a/src/libstd/kinds.rs
+++ b/src/libstd/kinds.rs
@@ -26,12 +26,6 @@ pub trait Send {
     // empty.
 }
 
-/// Types that are either immutable or have inherited mutability.
-#[lang="freeze"]
-pub trait Freeze {
-    // empty.
-}
-
 /// Types with a constant size known at compile-time.
 #[lang="sized"]
 pub trait Sized {
@@ -225,14 +219,6 @@ pub mod marker {
     #[deriving(Eq,Clone)]
     pub struct InvariantLifetime<'a>;
 
-    /// A type which is considered "not freezable", meaning that
-    /// its contents could change even if stored in an immutable
-    /// context or it is the referent of an `&T` pointer. This is
-    /// typically embedded in other types, such as `Cell`.
-    #[lang="no_freeze_bound"]
-    #[deriving(Eq,Clone)]
-    pub struct NoFreeze;
-
     /// A type which is considered "not sendable", meaning that it cannot
     /// be safely sent between tasks, even if it is owned. This is
     /// typically embedded in other types, such as `Gc`, to ensure that
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index f8e56cf8a2f..d487aa638ac 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -20,7 +20,7 @@ generally useful to many Rust programs.
 */
 
 // Reexported core operators
-pub use kinds::{Freeze, Pod, Send, Sized, Share};
+pub use kinds::{Pod, Send, Sized, Share};
 pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not};
 pub use ops::{BitAnd, BitOr, BitXor};
 pub use ops::{Drop, Deref, DerefMut};