Merge pull request #450 from paulstansifer/quick_error_message_fix_2

Flatten functions and objects in trans::simplify_type.
rust-lang · Jun 3, 2011 · c515ed1 · c515ed1
2 parents cb61d7b + 20bd927
commit c515ed1
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
@@ -1293,6 +1293,20 @@ fn simplify_type(&@crate_ctxt ccx, &ty::t typ) -> ty::t {
             case (ty::ty_vec(_)) {
                 ret ty::mk_imm_vec(ccx.tcx, ty::mk_nil(ccx.tcx));
             }
+            case (ty::ty_fn(_,_,_,_)) {
+                ret ty::mk_imm_tup(ccx.tcx, 
+                                   [ty::mk_imm_box(ccx.tcx, 
+                                                   ty::mk_nil(ccx.tcx)),
+                                    ty::mk_imm_box(ccx.tcx, 
+                                                   ty::mk_nil(ccx.tcx))]);
+            }
+            case (ty::ty_obj(_)) {
+                ret ty::mk_imm_tup(ccx.tcx, 
+                                   [ty::mk_imm_box(ccx.tcx, 
+                                                   ty::mk_nil(ccx.tcx)),
+                                    ty::mk_imm_box(ccx.tcx, 
+                                                   ty::mk_nil(ccx.tcx))]);
+            }
             case (_) { ret typ; }
         }
     }