---

yaml
---
r: 58780
b: refs/heads/incoming
c: 76f7207
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 87c46b548a5c9d3183a7d76db8c2e0660f917130
+refs/heads/incoming: 76f7207af22d1c64280b1dcbf7d99d198781e0b2
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/ty.rs

@@ -1253,6 +1253,16 @@ pub fn mk_opaque_closure_ptr(cx: ctxt, sigil: ast::Sigil) -> t {
 
 pub fn mk_opaque_box(cx: ctxt) -> t { mk_t(cx, ty_opaque_box) }
 
+// Converts s to its machine type equivalent
+pub fn mach_sty(cfg: @session::config, t: t) -> sty {
+    match get(t).sty {
+      ty_int(ast::ty_i) => ty_int(cfg.int_type),
+      ty_uint(ast::ty_u) => ty_uint(cfg.uint_type),
+      ty_float(ast::ty_f) => ty_float(cfg.float_type),
+      ref s => (/*bad*/copy *s)
+    }
+}
+
 pub fn walk_ty(ty: t, f: &fn(t)) {
     maybe_walk_ty(ty, |t| { f(t); true });
 }

branches/incoming/src/librustc/middle/typeck/infer/combine.rs

@@ -480,8 +480,6 @@ pub fn super_tys<C:Combine>(
             unify_float_variable(self, !self.a_is_expected(), v_id, v)
         }
 
-      (ty::ty_nil, _) |
-      (ty::ty_bool, _) |
       (ty::ty_int(_), _) |
       (ty::ty_uint(_), _) |
       (ty::ty_float(_), _) => {
@@ -492,6 +490,16 @@ pub fn super_tys<C:Combine>(
         }
       }
 
+      (ty::ty_nil, _) |
+      (ty::ty_bool, _) => {
+        let cfg = tcx.sess.targ_cfg;
+        if ty::mach_sty(cfg, a) == ty::mach_sty(cfg, b) {
+            Ok(a)
+        } else {
+            Err(ty::terr_sorts(expected_found(self, a, b)))
+        }
+      }
+
       (ty::ty_param(ref a_p), ty::ty_param(ref b_p)) if a_p.idx == b_p.idx => {
         Ok(a)
       }

branches/incoming/src/libstd/flatpipes.rs

@@ -678,6 +678,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(reason = "FIXME #6211 failing on linux snapshot machine")]
     fn test_serializing_pipes() {
         let (port, chan) = serial::pipe_stream();