---

yaml
---
r: 1262
b: refs/heads/master
c: 9cc00d5
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41b7d6d74da54b80419ab093303dd356fae957ec
+refs/heads/master: 9cc00d5f6cc85a825e79e29324261daa17e50048

trunk/src/comp/middle/ty.rs

@@ -889,7 +889,19 @@ fn unify(@ty.t expected, @ty.t actual, &unify_handler handler)
                 ret result;
             }
             case (ty.ty_param(?actual_id)) {
-                ret handler.unify_actual_param(actual_id, expected, actual);
+                alt (expected.struct) {
+
+                    // These two unify via logic lower down. Fall through.
+                    case (ty.ty_local(_)) { }
+                    case (ty.ty_var(_)) { }
+
+                    // More-concrete types can unify against params here.
+                    case (_) {
+                        ret handler.unify_actual_param(actual_id,
+                                                       expected,
+                                                       actual);
+                    }
+                }
             }
             case (_) { /* empty */ }
         }