---

catamorphism · catamorphism · commit 88cde355192c · 2011-06-02T17:52:04.000-07:00
yaml --- r: 2918 b: refs/heads/master c: 468786e h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c515ed13deafda59f0b8e00e7fa67802009e33fd
+refs/heads/master: 468786e36d5ab35afb54b60bc1d6147ba0db8733
diff --git a/trunk/src/comp/middle/ty.rs b/trunk/src/comp/middle/ty.rs
@@ -981,6 +981,7 @@ fn type_has_pointers(&ctxt cx, &t ty) -> bool {
     alt (struct(cx, ty)) {
         // scalar types
         case (ty_nil) { ret false; }
+        case (ty_bot) { ret false; }
         case (ty_bool) { ret false; }
         case (ty_int) { ret false; }
         case (ty_float) { ret false; }
@@ -2049,7 +2050,7 @@ mod unify {
                 result_mode = expected_input.mode;
             }
 
-            auto result = unify_step(cx, actual_input.ty, expected_input.ty);
+            auto result = unify_step(cx, expected_input.ty, actual_input.ty);
 
             alt (result) {
                 case (ures_ok(?rty)) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: c515ed13deafda59f0b8e00e7fa67802009e33fd`
	`2`	`+refs/heads/master: 468786e36d5ab35afb54b60bc1d6147ba0db8733`