---

yaml
---
r: 63093
b: refs/heads/snap-stage3
c: a593d8f
h: refs/heads/master
i:
  63091: 398f102
v: v3

Author: thestinger

[refs]

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

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/librustc/middle/typeck/check/mod.rs

@@ -2728,13 +2728,8 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
         });
         let mut bot_field = false;
         let mut err_field = false;
-
         let elt_ts = do elts.mapi |i, e| {
-            let opt_hint = match flds {
-                Some(ref fs) if i < fs.len() => Some(fs[i]),
-                _ => None
-            };
-            check_expr_with_opt_hint(fcx, *e, opt_hint);
+            check_expr_with_opt_hint(fcx, *e, flds.map(|fs| fs[i]));
             let t = fcx.expr_ty(*e);
             err_field = err_field || ty::type_is_error(t);
             bot_field = bot_field || ty::type_is_bot(t);