---

yaml
---
r: 153837
b: refs/heads/try2
c: c6b992a
h: refs/heads/master
i:
  153835: 5b6d20b
v: v3

Author: Ariel Ben-Yehuda

[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: 79e9f14abf50eecb7d3c53f10ad900615bb2d397
+refs/heads/try2: c6b992a53f6a9f3eee0883640adc270910dc9d87
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/doc/guide-container.md

@@ -118,7 +118,7 @@ differently.
 ## Container iterators
 
 Containers implement iteration over the contained elements by returning an
-iterator object. For example, for vector slices several iterators are available:
+iterator object. For example, vector slices several iterators available:
 
 * `iter()` for immutable references to the elements
 * `mut_iter()` for mutable references to the elements

branches/try2/src/libcollections/ringbuf.rs

@@ -19,8 +19,6 @@ use core::cmp;
 use core::default::Default;
 use core::fmt;
 use core::iter::RandomAccessIterator;
-use core::iter;
-use std::hash::{Writer, Hash};
 
 use {Deque, Collection, Mutable, MutableSeq};
 use vec::Vec;
@@ -452,21 +450,6 @@ impl<A: PartialEq> PartialEq for RingBuf<A> {
     }
 }
 
-impl<A: PartialOrd> PartialOrd for RingBuf<A> {
-    fn partial_cmp(&self, other: &RingBuf<A>) -> Option<Ordering> {
-        iter::order::partial_cmp(self.iter(), other.iter())
-    }
-}
-
-impl<S: Writer, A: Hash<S>> Hash<S> for RingBuf<A> {
-    fn hash(&self, state: &mut S) {
-        self.len().hash(state);
-        for elt in self.iter() {
-            elt.hash(state);
-        }
-    }
-}
-
 impl<A> FromIterator<A> for RingBuf<A> {
     fn from_iter<T: Iterator<A>>(iterator: T) -> RingBuf<A> {
         let (lower, _) = iterator.size_hint();
@@ -502,7 +485,6 @@ mod tests {
     use std::fmt::Show;
     use std::prelude::*;
     use std::gc::{GC, Gc};
-    use std::hash;
     use test::Bencher;
     use test;
 
@@ -930,37 +912,6 @@ mod tests {
         assert!(e == RingBuf::new());
     }
 
-    #[test]
-    fn test_hash() {
-      let mut x = RingBuf::new();
-      let mut y = RingBuf::new();
-
-      x.push(1i);
-      x.push(2);
-      x.push(3);
-
-      y.push(0i);
-      y.push(1i);
-      y.pop_front();
-      y.push(2);
-      y.push(3);
-
-      assert!(hash::hash(&x) == hash::hash(&y));
-    }
-
-    #[test]
-    fn test_ord() {
-        let x = RingBuf::new();
-        let mut y = RingBuf::new();
-        y.push(1i);
-        y.push(2);
-        y.push(3);
-        assert!(x < y);
-        assert!(y > x);
-        assert!(x <= x);
-        assert!(x >= x);
-    }
-
     #[test]
     fn test_show() {
         let ringbuf: RingBuf<int> = range(0i, 10).collect();

branches/try2/src/librustc/middle/typeck/coherence.rs

@@ -60,29 +60,25 @@ fn get_base_type(inference_context: &InferCtxt,
                  span: Span,
                  original_type: t)
                  -> Option<t> {
-    let resolved_type;
-    match resolve_type(inference_context,
-                       Some(span),
-                       original_type,
-                       resolve_ivar) {
-        Ok(resulting_type) if !type_is_ty_var(resulting_type) => {
-            resolved_type = resulting_type;
-        }
+    let resolved_type = match resolve_type(inference_context,
+                                           Some(span),
+                                           original_type,
+                                           resolve_ivar) {
+        Ok(resulting_type) if !type_is_ty_var(resulting_type) => resulting_type,
         _ => {
             inference_context.tcx.sess.span_fatal(span,
                                                   "the type of this value must be known in order \
                                                    to determine the base type");
         }
-    }
+    };
 
     match get(resolved_type).sty {
         ty_enum(..) | ty_struct(..) | ty_unboxed_closure(..) => {
             debug!("(getting base type) found base type");
             Some(resolved_type)
         }
-        // FIXME(14865) I would prefere to use `_` here, but that causes a
-        // compiler error.
-        ty_uniq(_) | ty_rptr(_, _) | ty_trait(..) if ty::type_is_trait(resolved_type) => {
+
+        _ if ty::type_is_trait(resolved_type) => {
             debug!("(getting base type) found base type (trait)");
             Some(resolved_type)
         }

branches/try2/src/libstd/collections/hashmap.rs

@@ -1850,7 +1850,6 @@ impl<T: Hash + Eq> HashSet<T, RandomSipHasher> {
     ///
     /// # Example
     ///
-    /// ```
     /// use std::collections::HashSet;
     /// let mut set: HashSet<int> = HashSet::new();
     /// ```
@@ -1864,7 +1863,6 @@ impl<T: Hash + Eq> HashSet<T, RandomSipHasher> {
     ///
     /// # Example
     ///
-    /// ```
     /// use std::collections::HashSet;
     /// let mut set: HashSet<int> = HashSet::with_capacity(10);
     /// ```
@@ -1922,7 +1920,6 @@ impl<T: Eq + Hash<S>, S, H: Hasher<S>> HashSet<T, H> {
     ///
     /// # Example
     ///
-    /// ```
     /// use std::collections::HashSet;
     /// let mut set: HashSet<int> = HashSet::new();
     /// set.reserve(10);