More test fixes and rebase conflicts!

src/libcollections/binary_heap.rs

@@ -572,7 +572,7 @@ impl<'a, T> DoubleEndedIterator<&'a T> for Items<'a, T> {
     fn next_back(&mut self) -> Option<(&'a T)> { self.iter.next_back() }
 }
 
-impl<'a, T> ExactSize<&'a T> for Items<'a, T> {}
+impl<'a, T> ExactSizeIterator<&'a T> for Items<'a, T> {}
 
 /// An iterator that moves out of a `BinaryHeap`.
 pub struct MoveItems<T> {

src/libcollections/ring_buf.rs

@@ -797,7 +797,7 @@ impl<T> DoubleEndedIterator<T> for MoveItems<T> {
 }
 
 
-impl<T> ExactSize<T> for MoveItems<T> {}
+impl<T> ExactSizeIterator<T> for MoveItems<T> {}
 
 impl<A: PartialEq> PartialEq for RingBuf<A> {
     fn eq(&self, other: &RingBuf<A>) -> bool {

src/librustc/diagnostics.rs

@@ -147,5 +147,6 @@ register_diagnostics!(
     E0168,
     E0169,
     E0170,
-    E0171
+    E0171,
+    E0172
 )

src/librustc/middle/traits/util.rs

@@ -42,18 +42,19 @@ pub fn supertraits<'cx, 'tcx>(tcx: &'cx ty::ctxt<'tcx>,
                               trait_ref: Rc<ty::TraitRef<'tcx>>)
                               -> Supertraits<'cx, 'tcx>
 {
-    /// Returns an iterator over the trait reference `T` and all of its supertrait references. May
-    /// contain duplicates. In general the ordering is not defined.
-    ///
-    /// Example:
-    ///
-    /// ```
-    /// trait Foo { ... }
-    /// trait Bar : Foo { ... }
-    /// trait Baz : Bar+Foo { ... }
-    /// ```
-    ///
-    /// `supertraits(Baz)` yields `[Baz, Bar, Foo, Foo]` in some order.
+    //! Returns an iterator over the trait reference `T` and all of its supertrait references. May
+    //! contain duplicates. In general the ordering is not defined.
+    //!
+    //! Example:
+    //!
+    //! ```
+    //! trait Foo { ... }
+    //! trait Bar : Foo { ... }
+    //! trait Baz : Bar+Foo { ... }
+    //! ```
+    //!
+    //! `supertraits(Baz)` yields `[Baz, Bar, Foo, Foo]` in some order.
+
     transitive_bounds(tcx, &[trait_ref])
 }
 

src/librustc/middle/typeck/astconv.rs

@@ -703,7 +703,7 @@ fn ast_ty_to_trait_ref<'tcx,AC,RS>(this: &AC,
                                                     path));
                 }
                 _ => {
-                    span_err!(this.tcx().sess, ty.span, E0170, "expected a reference to a trait");
+                    span_err!(this.tcx().sess, ty.span, E0172, "expected a reference to a trait");
                     Err(ErrorReported)
                 }
             }

src/librustc/middle/typeck/check/mod.rs

@@ -1252,8 +1252,6 @@ fn compare_impl_method<'tcx>(tcx: &ty::ctxt<'tcx>,
                                                 -> bool
     {
 
-        */
-
         let trait_params = trait_generics.regions.get_slice(subst::FnSpace);
         let impl_params = impl_generics.regions.get_slice(subst::FnSpace);
 

src/librustc_trans/trans/datum.rs

@@ -552,7 +552,7 @@ impl<'tcx, K: KindOps + fmt::Show> Datum<'tcx, K> {
                 self.kind)
     }
 
-    //! See the `appropriate_rvalue_mode()` function
+    /// See the `appropriate_rvalue_mode()` function
     pub fn appropriate_rvalue_mode<'a>(&self, ccx: &CrateContext<'a, 'tcx>)
                                        -> RvalueMode {
         appropriate_rvalue_mode(ccx, self.ty)

src/libterm/lib.rs

@@ -124,7 +124,7 @@ pub fn stderr() -> Option<Box<Terminal<WriterWrapper> + Send>> {
 #[cfg(windows)]
 /// Return a Terminal wrapping stderr, or None if a terminal couldn't be
 /// opened.
-pub fn stderr() -> Option<Box<Terminal<WriterWrapper> + Send> + Send> {
+pub fn stderr() -> Option<Box<Terminal<WriterWrapper> + Send>> {
     let ti = TerminfoTerminal::new(WriterWrapper {
         wrapped: box std::io::stderr() as Box<Writer + Send>,
     });