---

yaml
---
r: 48735
b: refs/heads/snap-stage3
c: 19bb166
h: refs/heads/master
i:
  48733: e88f9e9
  48731: 44550dd
  48727: b8e3b3c
  48719: a93b2ab
  48703: 102cf45
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a49ccee68efc7ec05e882e5929669108f65f74fa
+refs/heads/snap-stage3: 19bb16650f385755312e7d2399ce14e8253d92fa
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/core.rc

@@ -56,6 +56,7 @@ Implicitly, all crates behave as if they included the following prologue:
 
 // On Linux, link to the runtime with -lrt.
 #[cfg(target_os = "linux")]
+#[doc(hidden)]
 pub mod linkhack {
     #[link_args="-lrustrt -lrt"]
     #[link_args = "-lpthread"]
@@ -252,7 +253,7 @@ pub mod rt;
 // A curious inner-module that's not exported that contains the binding
 // 'core' so that macro-expanded references to core::error and such
 // can be resolved within libcore.
-#[doc(hidden)] // FIXME #3538
+#[doc(hidden)]
 pub mod core {
     #[cfg(stage0)]
     pub const error : u32 = 1_u32;

branches/snap-stage3/src/libcore/option.rs

@@ -46,7 +46,7 @@ use ops::Add;
 use kinds::Copy;
 use util;
 use num::Zero;
-use iter::{BaseIter, MutableIter};
+use iter::BaseIter;
 
 #[cfg(test)] use ptr;
 #[cfg(test)] use str;
@@ -323,13 +323,6 @@ impl<T> BaseIter<T> for Option<T> {
     }
 }
 
-impl<T> MutableIter<T> for Option<T> {
-    #[inline(always)]
-    fn each_mut(&mut self, f: &fn(&'self mut T) -> bool) {
-        match *self { None => (), Some(ref mut t) => { f(t); } }
-    }
-}
-
 pub impl<T> Option<T> {
     /// Returns true if the option equals `none`
     #[inline(always)]

branches/snap-stage3/src/librustdoc/rustdoc.rc

@@ -116,8 +116,7 @@ fn run(config: Config) {
             // Remove things marked doc(hidden)
             prune_hidden_pass::mk_pass(),
             // Remove things that are private
-            // XXX enable this after 'export' is removed in favor of 'pub'
-            // prune_private_pass::mk_pass(),
+            prune_private_pass::mk_pass(),
             // Extract brief documentation from the full descriptions
             desc_to_brief_pass::mk_pass(),
             // Massage the text to remove extra indentation

branches/snap-stage3/src/libstd/treemap.rs

@@ -72,7 +72,7 @@ pure fn lt<K: Ord + TotalOrd, V>(a: &TreeMap<K, V>,
         }
     };
 
-    a_len < b_len
+    return a_len < b_len;
 }
 
 impl<K: Ord + TotalOrd, V> Ord for TreeMap<K, V> {
@@ -694,13 +694,22 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
 
                 skew(save);
 
-                for save.right.each_mut |right| {
+                match save.right {
+                  Some(ref mut right) => {
                     skew(right);
-                    for right.right.each_mut |x| { skew(x) }
+                    match right.right {
+                      Some(ref mut x) => { skew(x) },
+                      None => ()
+                    }
+                  }
+                  None => ()
                 }
 
                 split(save);
-                for save.right.each_mut |x| { split(x) }
+                match save.right {
+                  Some(ref mut x) => { split(x) },
+                  None => ()
+                }
             }
 
             return removed;
@@ -709,7 +718,7 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
     }
 
     *node = None;
-    true
+    return true;
 }
 
 #[cfg(test)]