---

yaml
---
r: 3022
b: refs/heads/master
c: 1377e9b
h: refs/heads/master
v: v3

Author: paulstansifer

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cd10d2fef8ffa68903b18726f19ac52a04725cc
+refs/heads/master: 1377e9b341a03915c48a564fb30e70022d04c78f

trunk/src/comp/front/ast.rs

@@ -504,7 +504,7 @@ fn is_constraint_arg(@expr e) -> bool {
 }
 
 fn eq_ty(&@ty a, &@ty b) -> bool {
-    ret a == b;
+    ret std::box::ptr_eq(a,b);
 }
 
 fn hash_ty(&@ty t) -> uint {

trunk/src/comp/middle/ty.rs

@@ -61,11 +61,6 @@ type item_table = hashmap[ast::def_id,any_item];
 
 type mt = rec(t ty, ast::mutability mut);
 
-tag cached_ty {
-    in_progress;
-    done(t);
-}
-
 // Contains information needed to resolve types and (in the future) look up
 // the types of AST nodes.
 type creader_cache = hashmap[tup(int,uint,uint),ty::t];
@@ -77,7 +72,7 @@ type ctxt = rec(@type_store ts,
                 type_cache tcache,
                 creader_cache rcache,
                 hashmap[t,str] short_names_cache,
-                hashmap[@ast::ty,cached_ty] ast_ty_to_ty_cache);
+                hashmap[@ast::ty,option::t[t]] ast_ty_to_ty_cache);
 type ty_ctxt = ctxt;    // Needed for disambiguation from unify::ctxt.
 
 // Convert from method type to function type.  Pretty easy; we just drop
@@ -253,7 +248,7 @@ fn mk_ctxt(session::session s, resolve::def_map dm) -> ctxt {
             short_names_cache =
             map::mk_hashmap[ty::t,str](ty::hash_ty, ty::eq_ty),
             ast_ty_to_ty_cache = 
-            map::mk_hashmap[@ast::ty,cached_ty](ast::hash_ty, ast::eq_ty));
+            map::mk_hashmap[@ast::ty,option::t[t]](ast::hash_ty, ast::eq_ty));
 
     populate_type_store(cx);
     ret cx;

trunk/src/comp/middle/typeck.rs

@@ -228,14 +228,14 @@ fn ast_mode_to_mode(ast::mode mode) -> ty::mode {
 // corresponding to a definition ID:
 fn ast_ty_to_ty(&ty::ctxt tcx, &ty_getter getter, &@ast::ty ast_ty) -> ty::t {
     alt (tcx.ast_ty_to_ty_cache.find(ast_ty)) {
-        case (some[ty::cached_ty](ty::done(?ty))) { ret ty; } 
-        case (some[ty::cached_ty](ty::in_progress)) {
+        case (some[option::t[ty::t]](some[ty::t](?ty))) { ret ty; } 
+        case (some[option::t[ty::t]](none)) {
             tcx.sess.span_err(ast_ty.span, "illegal recursive type "
                 + "(insert a tag in the cycle, if this is desired)");
         }
-        case (none[ty::cached_ty]) { } /* go on */
+        case (none[option::t[ty::t]]) { } /* go on */
     }
-    tcx.ast_ty_to_ty_cache.insert(ast_ty, ty::in_progress);
+    tcx.ast_ty_to_ty_cache.insert(ast_ty, none[ty::t]);
 
     fn ast_arg_to_arg(&ty::ctxt tcx,
                       &ty_getter getter,
@@ -371,7 +371,7 @@ fn ast_ty_to_ty(&ty::ctxt tcx, &ty_getter getter, &@ast::ty ast_ty) -> ty::t {
         }
     }
 
-    tcx.ast_ty_to_ty_cache.insert(ast_ty, ty::done(typ));
+    tcx.ast_ty_to_ty_cache.insert(ast_ty, some(typ));
     ret typ;
 }
 

trunk/src/test/compile-fail/type-recursive.rs

@@ -1,4 +1,4 @@
 // error-pattern:illegal recursive type
 type t1 = rec(int foo, t1 foolish);
 
-fn main() {}
+fn main() {}