Merge branch 'master' of https://github.com/mozilla/rust

1 files changed, 2 insertions, 21 deletions

diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs
index 95deec08feb..b828c4ef629 100644
--- a/src/libstd/workcache.rs
+++ b/src/libstd/workcache.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[allow(deprecated_mode)];
+
 use json;
 use sha1;
 use serialize::{Encoder, Encodable, Decoder, Decodable};
@@ -167,20 +169,6 @@ struct Database {
 }
 
 impl Database {
-    #[cfg(stage0)]
-    #[cfg(stage1)]
-    fn prepare(&mut self, fn_name: &str,
-               declared_inputs: &WorkMap) -> Option<(WorkMap, WorkMap, ~str)>
-    {
-        let k = json_encode(&(fn_name, declared_inputs));
-        let db_cache = copy self.db_cache;
-        match db_cache.find(&k) {
-            None => None,
-            Some(&v) => Some(json_decode(copy v))
-        }
-    }
-
-    #[cfg(stage2)]
     fn prepare(&mut self, fn_name: &str,
                declared_inputs: &WorkMap) -> Option<(WorkMap, WorkMap, ~str)>
     {
@@ -235,13 +223,6 @@ struct Exec {
     discovered_outputs: WorkMap
 }
 
-#[cfg(stage0)]
-struct Work<T:Owned> {
-    prep: @Mut<Prep>,
-    res: Option<Either<T,PortOne<(Exec,T)>>>
-}
-#[cfg(stage1)]
-#[cfg(stage2)]
 struct Work<T> {
     prep: @Mut<Prep>,
     res: Option<Either<T,PortOne<(Exec,T)>>>