---

yaml
---
r: 85943
b: refs/heads/dist-snap
c: 698873e
h: refs/heads/master
i:
  85941: 6ac59b3
  85939: b667b03
  85935: 1756b92
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 31fa86511c0b7ccfc3d9977730593d0fd442f6fe
+refs/heads/dist-snap: 698873e3a829d764b451f657178403c704044721
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/mk/rt.mk

@@ -173,10 +173,17 @@ LIBUV_MAKEFILE_$(1)_$(2) := $$(CFG_BUILD_DIR)rt/$(1)/stage$(2)/libuv/Makefile
 LIBUV_NO_LOAD = run-benchmarks.target.mk run-tests.target.mk \
 		uv_dtrace_header.target.mk uv_dtrace_provider.target.mk
 
+ifeq ($(OSTYPE_$(1)), linux-androideabi)
+$$(LIBUV_MAKEFILE_$(1)_$(2)): $$(LIBUV_GYP)
+	(cd $(S)src/libuv/ && \
+	 $$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja -DOS=android \
+	   -Goutput_dir=$$(@D) --generator-output $$(@D))
+else
 $$(LIBUV_MAKEFILE_$(1)_$(2)): $$(LIBUV_GYP)
 	(cd $(S)src/libuv/ && \
 	 $$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
 	   -Goutput_dir=$$(@D) --generator-output $$(@D))
+endif
 
 # XXX: Shouldn't need platform-specific conditions here
 ifdef CFG_WINDOWSY_$(1)
@@ -194,8 +201,10 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)_$(2))
 		LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
 		CC="$$(CC_$(1))" \
 		CXX="$$(CXX_$(1))" \
+	 	LINK="$$(CXX_$(1))" \
 		AR="$$(AR_$(1))" \
 		host=android OS=linux \
+		PLATFORM=android \
 		builddir="." \
 		BUILDTYPE=Release \
 		NO_LOAD="$$(LIBUV_NO_LOAD)" \

branches/dist-snap/src/libextra/json.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -1164,6 +1164,9 @@ impl Ord for Json {
             }
         }
     }
+    fn le(&self, other: &Json) -> bool { !(*other).lt(&(*self)) }
+    fn ge(&self, other: &Json) -> bool { !(*self).lt(other) }
+    fn gt(&self, other: &Json) -> bool { (*other).lt(&(*self))  }
 }
 
 /// A trait for converting values to JSON

branches/dist-snap/src/libextra/num/rational.rs

@@ -107,7 +107,7 @@ macro_rules! cmp_impl {
 }
 cmp_impl!(impl Eq, eq, ne)
 cmp_impl!(impl TotalEq, equals)
-cmp_impl!(impl Ord, lt)
+cmp_impl!(impl Ord, lt, gt, le, ge)
 cmp_impl!(impl TotalOrd, cmp -> cmp::Ordering)
 
 impl<T: Clone + Integer + Ord> Orderable for Ratio<T> {

branches/dist-snap/src/libextra/semver.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -37,6 +37,18 @@ impl cmp::Ord for Identifier {
             (&AlphaNumeric(_), _) => false
         }
     }
+    #[inline]
+    fn le(&self, other: &Identifier) -> bool {
+        ! (other < self)
+    }
+    #[inline]
+    fn gt(&self, other: &Identifier) -> bool {
+        other < self
+    }
+    #[inline]
+    fn ge(&self, other: &Identifier) -> bool {
+        ! (self < other)
+    }
 }
 
 impl ToStr for Identifier {

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

@@ -80,6 +80,19 @@ pub trait Signed: Num
 
 pub trait Unsigned: Num {}
 
+/// Times trait
+///
+/// ~~~ {.rust}
+/// use num::Times;
+/// let ten = 10 as uint;
+/// let mut accum = 0;
+/// do ten.times { accum += 1; }
+/// ~~~
+///
+pub trait Times {
+    fn times(&self, it: &fn());
+}
+
 pub trait Integer: Num
                  + Orderable
                  + Div<Self,Self>

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

@@ -10,7 +10,7 @@
 
 //! Operations and constants for `uint`
 
-use iter;
+use num;
 use sys;
 
 pub use self::generated::*;
@@ -70,7 +70,7 @@ pub fn div_round(x: uint, y: uint) -> uint {
 ///
 pub fn div_floor(x: uint, y: uint) -> uint { return x / y; }
 
-impl iter::Times for uint {
+impl num::Times for uint {
     #[inline]
     ///
     /// A convenience form for basic repetition. Given a uint `x`,
@@ -162,7 +162,7 @@ fn test_div() {
 
 #[test]
 pub fn test_times() {
-    use iter::Times;
+    use num::Times;
     let ten = 10 as uint;
     let mut accum = 0;
     do ten.times { accum += 1; }

branches/dist-snap/src/libstd/num/uint.rs

@@ -49,7 +49,7 @@ pub use cmp::{Eq, ApproxEq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Great
 pub use char::Char;
 pub use container::{Container, Mutable, Map, MutableMap, Set, MutableSet};
 pub use hash::Hash;
-pub use iter::Times;
+pub use num::Times;
 pub use iterator::{FromIterator, Extendable};
 pub use iterator::{Iterator, DoubleEndedIterator, RandomAccessIterator, ClonableIterator};
 pub use iterator::{OrdIterator, MutableDoubleEndedIterator};

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

@@ -718,7 +718,7 @@ mod test {
     use option::*;
     use rt::test::*;
     use cell::Cell;
-    use iter::Times;
+    use num::Times;
     use rt::util;
 
     #[test]

branches/dist-snap/src/libstd/rt/comm.rs

@@ -1114,7 +1114,7 @@ mod test {
     #[test]
     fn multithreading() {
         use rt::comm::*;
-        use iter::Times;
+        use num::Times;
         use vec::OwnedVector;
         use container::Container;
 

branches/dist-snap/src/libstd/rt/sched.rs

@@ -126,7 +126,7 @@ pub fn select2<TA, A: SelectPort<TA>, TB, B: SelectPort<TB>>(mut a: A, mut b: B)
 mod test {
     use super::*;
     use clone::Clone;
-    use iter::Times;
+    use num::Times;
     use option::*;
     use rt::comm::*;
     use rt::test::*;

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

@@ -140,7 +140,6 @@ pub mod borrow;
 pub mod from_str;
 #[path = "num/num.rs"]
 pub mod num;
-pub mod iter;
 pub mod iterator;
 pub mod to_str;
 pub mod to_bytes;
@@ -220,4 +219,3 @@ mod std {
     pub use fmt;
     pub use to_bytes;
 }
-

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

@@ -21,7 +21,7 @@ use char;
 use char::Char;
 use clone::{Clone, DeepClone};
 use container::{Container, Mutable};
-use iter::Times;
+use num::Times;
 use iterator::{Iterator, FromIterator, Extendable};
 use iterator::{Filter, AdditiveIterator, Map};
 use iterator::{Invert, DoubleEndedIterator};

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

@@ -1 +1 @@
-Subproject commit ef2bcd134164adcaa072dcb56e62b737fdcb075e
+Subproject commit d88cf5652a1afb23939da0bae86c70ec521b9921

branches/dist-snap/src/libuv

@@ -1 +1 @@
-Subproject commit 0964c68ddf2c67ce455e7443a06f4bb3db9e92bb
+Subproject commit 08a3bd96ee6e1d141494f0014ede75d9871114c4