---

yaml
---
r: 63119
b: refs/heads/snap-stage3
c: e2ec8e7
h: refs/heads/master
i:
  63117: 43218ab
  63115: ca91601
  63111: f19590d
  63103: cd6fe44
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8b87debbc28d947220614f315cbcee5dfe17436a
+refs/heads/snap-stage3: e2ec8e71cec0373616953f8188cf7c4953269af0
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

@@ -138,7 +138,7 @@ validate_opt () {
         done
         if [ "$arg" = "--help" ]
         then
-            echo
+            echo ""
             echo "No more help available for Configure options,"
             echo "check the Uncyclo or join our IRC channel"
             break
@@ -349,11 +349,11 @@ if [ "$1" = "--help" ]
 then
     HELP=1
     shift
-    echo
+    echo ""
     echo "Usage: $CFG_SELF [options]"
-    echo
+    echo ""
     echo "Options:"
-    echo
+    echo ""
 else
     msg "recreating config.tmp"
     echo '' >config.tmp
@@ -394,7 +394,7 @@ validate_opt
 
 if [ $HELP -eq 1 ]
 then
-    echo
+    echo ""
     exit 0
 fi
 

branches/snap-stage3/mk/rt.mk

@@ -211,7 +211,8 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
 endif
 
 $$(JEMALLOC_LIB_$(1)_$(2)):
-	cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure --disable-experimental
+	cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \
+		--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1)
 	$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc
 
 # These could go in rt.mk or rustllvm.mk, they're needed for both.

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

@@ -51,6 +51,7 @@ pub use old_iter::{CopyableIter, CopyableOrderedIter, CopyableNonstrictIter};
 pub use old_iter::{ExtendedMutableIter};
 pub use iter::{Times, FromIter};
 // FIXME: #5898 pub use iterator::{Iterator, IteratorUtil};
+pub use iterator::Iterator;
 pub use num::{Num, NumCast};
 pub use num::{Orderable, Signed, Unsigned, Round};
 pub use num::{Algebraic, Trigonometric, Exponential, Hyperbolic};