auto merge of #7490 : mozilla/rust/rollup, r=thestinger

603137c r=cmr
fe10db2 r=bstrie

src/librust/rust.rs

@@ -238,6 +238,12 @@ fn usage() {
 
 pub fn main() {
     let os_args = os::args();
+
+    if (os_args.len() > 1 && (os_args[1] == ~"-v" || os_args[1] == ~"--version")) {
+        rustc::version(os_args[0]);
+        unsafe { exit(0); }
+    }
+
     let args = os_args.tail();
 
     if !args.is_empty() {

src/libstd/iterator.rs

@@ -356,20 +356,20 @@ pub trait IteratorUtil<A> {
     ///
     /// # Example
     ///
-    /// --- {.rust}
+    /// ~~~ {.rust}
     /// let xs = [-3, 0, 1, 5, -10];
     /// assert_eq!(*xs.iter().max_by(|x| x.abs()).unwrap(), -10);
-    /// ---
+    /// ~~~
     fn max_by<B: Ord>(&mut self, f: &fn(&A) -> B) -> Option<A>;
 
     /// Return the element that gives the minimum value from the specfied function
     ///
     /// # Example
     ///
-    /// --- {.rust}
+    /// ~~~ {.rust}
     /// let xs = [-3, 0, 1, 5, -10];
     /// assert_eq!(*xs.iter().min_by(|x| x.abs()).unwrap(), 0);
-    /// ---
+    /// ~~~
     fn min_by<B: Ord>(&mut self, f: &fn(&A) -> B) -> Option<A>;
 }
 

src/libstd/vec.rs

@@ -23,6 +23,7 @@ use iter::FromIter;
 use kinds::Copy;
 use libc;
 use num::Zero;
+use ops::Add;
 use option::{None, Option, Some};
 use ptr::to_unsafe_ptr;
 use ptr;
@@ -40,6 +41,7 @@ use util;
 
 #[cfg(not(test))] use cmp::Equiv;
 
+#[doc(hidden)]
 pub mod rustrt {
     use libc;
     use vec::raw;
@@ -1180,16 +1182,10 @@ impl<T:Ord> Ord for @[T] {
 }
 
 #[cfg(not(test))]
-pub mod traits {
-    use kinds::Copy;
-    use ops::Add;
-    use vec::append;
-
-    impl<'self,T:Copy> Add<&'self [T],~[T]> for ~[T] {
-        #[inline]
-        fn add(&self, rhs: & &'self [T]) -> ~[T] {
-            append(copy *self, (*rhs))
-        }
+impl<'self,T:Copy> Add<&'self [T], ~[T]> for ~[T] {
+    #[inline]
+    fn add(&self, rhs: & &'self [T]) -> ~[T] {
+        append(copy *self, (*rhs))
     }
 }