---

yaml
---
r: 139019
b: refs/heads/try2
c: fdf8543
h: refs/heads/master
i:
  139017: 6dc89ed
  139015: 7242e93
v: v3

Author: jbclements

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 2b059c6e5638de7b241ffddb38cef906813de245
+refs/heads/try2: fdf8543cf61103e56cd86eadd845a65f12eaad54
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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/try2/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)]

branches/try2/src/libsyntax/codemap.rs

@@ -140,7 +140,7 @@ impl cmp::Eq for span {
 
 impl<S:Encoder> Encodable<S> for span {
     /* Note #1972 -- spans are encoded but not decoded */
-    fn encode(&self, _s: &S) { }
+    fn encode(&self, _s: &S) { _s.emit_nil() }
 }
 
 impl<D:Decoder> Decodable<D> for span {

branches/try2/src/rustllvm/RustWrapper.cpp

@@ -433,10 +433,10 @@ LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
   Options.EnableSegmentedStacks = EnableSegmentedStacks;
 
   std::string Err;
-  std::string Trip(Triple::normalize(triple));
+  const Target *TheTarget = TargetRegistry::lookupTarget(triple, Err);
   std::string FeaturesStr;
+  std::string Trip(triple);
   std::string CPUStr("generic");
-  const Target *TheTarget = TargetRegistry::lookupTarget(Trip, Err);
   TargetMachine *Target =
     TheTarget->createTargetMachine(Trip, CPUStr, FeaturesStr,
 				   Options, Reloc::PIC_,