---

yaml
---
r: 53881
b: refs/heads/dist-snap
c: 2b059c6
h: refs/heads/master
i:
  53879: ecf1e4b
v: v3

Author: bors

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 2b6614f2e610e1bfdd45c236dd071a72673980c8
+refs/heads/dist-snap: 2b059c6e5638de7b241ffddb38cef906813de245
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/deque.rs

@@ -22,61 +22,40 @@ pub struct Deque<T> {
 }
 
 impl<T> Container for Deque<T> {
-    /// Return the number of elements in the deque
     pure fn len(&self) -> uint { self.nelts }
-
-    /// Return true if the deque contains no elements
     pure fn is_empty(&self) -> bool { self.len() == 0 }
 }
 
 impl<T> Mutable for Deque<T> {
-    /// Clear the deque, removing all values.
     fn clear(&mut self) {
-        for self.elts.each_mut |x| { *x = None }
+        for vec::each_mut(self.elts) |x| { *x = None }
         self.nelts = 0;
         self.lo = 0;
         self.hi = 0;
     }
 }
 
 pub impl<T> Deque<T> {
-    /// Create an empty Deque
     static pure fn new() -> Deque<T> {
         Deque{nelts: 0, lo: 0, hi: 0,
               elts: vec::from_fn(initial_capacity, |_| None)}
     }
 
-    /// Return a reference to the first element in the deque
-    ///
-    /// Fails if the deque is empty
     fn peek_front(&self) -> &self/T { get(self.elts, self.lo) }
-
-    /// Return a reference to the last element in the deque
-    ///
-    /// Fails if the deque is empty
     fn peek_back(&self) -> &self/T { get(self.elts, self.hi - 1u) }
 
-    /// Retrieve an element in the deque by index
-    ///
-    /// Fails if there is no element with the given index
     fn get(&self, i: int) -> &self/T {
         let idx = (self.lo + (i as uint)) % self.elts.len();
         get(self.elts, idx)
     }
 
-    /// Remove and return the first element in the deque
-    ///
-    /// Fails if the deque is empty
     fn pop_front(&mut self) -> T {
         let mut result = self.elts[self.lo].swap_unwrap();
         self.lo = (self.lo + 1u) % self.elts.len();
         self.nelts -= 1u;
         result
     }
 
-    /// Remove and return the last element in the deque
-    ///
-    /// Fails if the deque is empty
     fn pop_back(&mut self) -> T {
         if self.hi == 0u {
             self.hi = self.elts.len() - 1u;
@@ -87,7 +66,6 @@ pub impl<T> Deque<T> {
         result
     }
 
-    /// Prepend an element to the deque
     fn add_front(&mut self, t: T) {
         let oldlo = self.lo;
         if self.lo == 0u {
@@ -102,7 +80,6 @@ pub impl<T> Deque<T> {
         self.nelts += 1u;
     }
 
-    /// Append an element to the deque
     fn add_back(&mut self, t: T) {
         if self.lo == self.hi && self.nelts != 0u {
             self.elts = grow(self.nelts, self.lo, self.elts);

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

@@ -636,13 +636,14 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
     fn heir_swap<K: TotalOrd, V>(node: &mut ~TreeNode<K, V>,
                             child: &mut Option<~TreeNode<K, V>>) {
         // *could* be done without recursion, but it won't borrow check
-        for child.each_mut |x| {
-            if x.right.is_some() {
-                heir_swap(node, &mut x.right);
+        do child.mutate |mut child| {
+            if child.right.is_some() {
+                heir_swap(node, &mut child.right);
             } else {
-                node.key <-> x.key;
-                node.value <-> x.value;
+                node.key <-> child.key;
+                node.value <-> child.value;
             }
+            child
         }
     }
 
@@ -688,7 +689,7 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
                 save.level -= 1;
 
                 if right_level > save.level {
-                    for save.right.each_mut |x| { x.level = save.level }
+                    do save.right.mutate |mut x| { x.level = save.level; x }
                 }
 
                 skew(save);
@@ -987,6 +988,8 @@ mod test_treemap {
         let m = m;
         let mut a = m.iter();
 
+        // FIXME: #4492 (ICE): iter.get() == Some((&x1, &y1))
+
         fail_unless!(map_next(&mut a).unwrap() == (&x1, &y1));
         fail_unless!(map_next(&mut a).unwrap() == (&x2, &y2));
         fail_unless!(map_next(&mut a).unwrap() == (&x3, &y3));

branches/dist-snap/src/rustllvm/RustWrapper.cpp

@@ -433,10 +433,10 @@ LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
   Options.EnableSegmentedStacks = EnableSegmentedStacks;
 
   std::string Err;
-  const Target *TheTarget = TargetRegistry::lookupTarget(triple, Err);
+  std::string Trip(Triple::normalize(triple));
   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_,