From 15ba0c310a2bfe2ab69670d0d87529a29d527973 Mon Sep 17 00:00:00 2001
From: Eduard Burtescu <edy.burt@gmail.com>
Date: Mon, 27 Jan 2014 14:18:36 +0200
Subject: Demote self to an (almost) regular argument and remove the env param.
 Fixes #10667 and closes #10259.

---
 src/libstd/io/buffered.rs         |  2 +-
 src/libstd/reflect.rs             |  9 ++-------
 src/libstd/repr.rs                | 10 ++--------
 src/libstd/unstable/intrinsics.rs |  4 +++-
 4 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index 745273a1d74..64e42c5480f 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -230,7 +230,7 @@ impl<W: Writer> LineBufferedWriter<W> {
     /// Unwraps this buffer, returning the underlying writer.
     ///
     /// The internal buffer is flushed before returning the writer.
-    pub fn unwrap(mut self) -> W { self.inner.unwrap() }
+    pub fn unwrap(self) -> W { self.inner.unwrap() }
 }
 
 impl<W: Writer> Writer for LineBufferedWriter<W> {
diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs
index c0af649f26c..87655f5911f 100644
--- a/src/libstd/reflect.rs
+++ b/src/libstd/reflect.rs
@@ -451,13 +451,8 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
         true
     }
 
-    fn visit_opaque_box(&mut self) -> bool {
-        self.align_to::<@u8>();
-        if ! self.inner.visit_opaque_box() { return false; }
-        self.bump_past::<@u8>();
-        true
-    }
-
+    // NOTE remove after next snapshot
+    #[cfg(stage0)]
     fn visit_closure_ptr(&mut self, ck: uint) -> bool {
         self.align_to::<proc()>();
         if ! self.inner.visit_closure_ptr(ck) {
diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs
index e3b34147c01..1ecc31ec2f4 100644
--- a/src/libstd/repr.rs
+++ b/src/libstd/repr.rs
@@ -580,14 +580,8 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
     fn visit_self(&mut self) -> bool { true }
     fn visit_type(&mut self) -> bool { true }
 
-    fn visit_opaque_box(&mut self) -> bool {
-        self.writer.write(['@' as u8]);
-        self.get::<&raw::Box<()>>(|this, b| {
-            let p = ptr::to_unsafe_ptr(&b.data) as *u8;
-            this.visit_ptr_inner(p, b.type_desc);
-        })
-    }
-
+    // NOTE remove after next snapshot
+    #[cfg(stage0)]
     fn visit_closure_ptr(&mut self, _ck: uint) -> bool { true }
 }
 
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index 198df3090ee..1988993707f 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -164,7 +164,9 @@ pub trait TyVisitor {
     fn visit_param(&mut self, i: uint) -> bool;
     fn visit_self(&mut self) -> bool;
     fn visit_type(&mut self) -> bool;
-    fn visit_opaque_box(&mut self) -> bool;
+
+    // NOTE remove after next snapshot
+    #[cfg(stage0)]
     fn visit_closure_ptr(&mut self, ck: uint) -> bool;
 }
 
-- 
cgit 1.4.1-3-g733a5