---

yaml
---
r: 66474
b: refs/heads/master
c: b4bb364
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9c3ef892f90289b6af77cbfe6c50dfb56eeb4c17
+refs/heads/master: b4bb36490d10a9d2613448215f2436f258e7fd28
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/configure

@@ -402,7 +402,7 @@ fi
 step_msg "looking for build programs"
 
 probe_need CFG_PERL        perl
-probe_need CFG_CURLORWGET  curl wget
+probe_need CFG_CURL        curl
 probe_need CFG_PYTHON      python2.7 python2.6 python2 python
 
 python_version=$($CFG_PYTHON -V 2>&1)

trunk/src/etc/snapshot.py

@@ -1,6 +1,6 @@
 # xfail-license
 
-import re, os, sys, glob, tarfile, shutil, subprocess, tempfile, distutils.spawn
+import re, os, sys, glob, tarfile, shutil, subprocess, tempfile
 
 try:
   import hashlib
@@ -132,13 +132,7 @@ def local_rev_committer_date():
 def get_url_to_file(u,f):
     # no security issue, just to stop partial download leaving a stale file
     tmpf = f + '.tmp'
-
-    returncode = -1
-    if distutils.spawn.find_executable("curl"):
-        returncode = subprocess.call(["curl", "-o", tmpf, u])
-    elif distutils.spawn.find_executable("wget"):
-        returncode = subprocess.call(["wget", "-O", tmpf, u])
-
+    returncode = subprocess.call(["curl", "-o", tmpf, u])
     if returncode != 0:
         os.unlink(tmpf)
         raise

trunk/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() {

trunk/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>;
 }
 

trunk/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))
     }
 }