From b4ddee6327eadbc6ef3cfb75d272f490259a4257 Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Fri, 21 Mar 2014 23:49:19 +0100
Subject: [PATCH] std: Remove the Freeze kind and the NoFreeze marker

---
 src/libstd/kinds.rs   | 14 --------------
 src/libstd/prelude.rs |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/libstd/kinds.rs b/src/libstd/kinds.rs
index b44616421d18..c0a442a61411 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 f8e56cf8a2f4..d487aa638ac0 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -20,7 +20,7 @@
 */
 
 // 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};