---

yaml
---
r: 2202
b: refs/heads/master
c: c7473c8
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fac8cc3b066da8351dc24b209c1a070a53b16a61
+refs/heads/master: c7473c8260cbe6892eeed82f275bf09a73895e0e

trunk/src/comp/front/ast.rs

@@ -22,8 +22,8 @@ type ty_param = ident;
 // Annotations added during successive passes.
 tag ann {
     ann_none;
-    ann_type(@middle.ty.t,
-             option.t[vec[@middle.ty.t]], /* ty param substs */
+    ann_type(middle.ty.t,
+             option.t[vec[middle.ty.t]], /* ty param substs */
              option.t[@ts_ann]); /* pre- and postcondition for typestate */
 }
 

trunk/src/comp/front/creader.rs

@@ -63,7 +63,7 @@ fn next(@pstate st) -> u8 {
     ret ch as u8;
 }
 
-fn parse_ty_str(str rep, str_def sd, @ty.type_store tystore) -> @ty.t {
+fn parse_ty_str(str rep, str_def sd, @ty.type_store tystore) -> ty.t {
     auto len = _str.byte_len(rep);
     auto st = @rec(rep=rep, mutable pos=0u, len=len, tystore=tystore);
     auto result = parse_ty(st, sd);
@@ -75,7 +75,7 @@ fn parse_ty_str(str rep, str_def sd, @ty.type_store tystore) -> @ty.t {
     ret result;
 }
 
-fn parse_ty(@pstate st, str_def sd) -> @ty.t {
+fn parse_ty(@pstate st, str_def sd) -> ty.t {
     alt (next(st) as char) {
         case ('n') { ret ty.mk_nil(st.tystore); }
         case ('b') { ret ty.mk_bool(st.tystore); }
@@ -101,7 +101,7 @@ fn parse_ty(@pstate st, str_def sd) -> @ty.t {
         case ('t') {
             check(next(st) as char == '[');
             auto def = parse_def(st, sd);
-            let vec[@ty.t] params = vec();
+            let vec[ty.t] params = vec();
             while (peek(st) as char != ']') {
                 params += vec(parse_ty(st, sd));
             }
@@ -213,7 +213,7 @@ fn parse_int(@pstate st) -> int {
     ret n;
 }
 
-fn parse_ty_fn(@pstate st, str_def sd) -> tup(vec[ty.arg], @ty.t) {
+fn parse_ty_fn(@pstate st, str_def sd) -> tup(vec[ty.arg], ty.t) {
     check(next(st) as char == '[');
     let vec[ty.arg] inputs = vec();
     while (peek(st) as char != ']') {
@@ -331,7 +331,7 @@ fn variant_tag_id(&ebml.doc d) -> ast.def_id {
     ret parse_def_id(ebml.doc_data(tagdoc));
 }
 
-fn item_type(&ebml.doc item, int this_cnum, @ty.type_store tystore) -> @ty.t {
+fn item_type(&ebml.doc item, int this_cnum, @ty.type_store tystore) -> ty.t {
     fn parse_external_def_id(int this_cnum, str s) -> ast.def_id {
         // FIXME: This is completely wrong when linking against a crate
         // that, in turn, links against another crate. We need a mapping
@@ -545,7 +545,7 @@ fn get_tag_variants(session.session sess,
     for (ast.def_id did in variant_ids) {
         auto item = find_item(did._1, items);
         auto ctor_ty = item_type(item, external_crate_id, tystore);
-        let vec[@ty.t] arg_tys = vec();
+        let vec[ty.t] arg_tys = vec();
         alt (ty.struct(ctor_ty)) {
             case (ty.ty_fn(_, ?args, _)) {
                 for (ty.arg a in args) {

trunk/src/comp/middle/metadata.rs

@@ -52,7 +52,7 @@ const uint tag_index_table = 0x15u;
 // Callback to translate defs to strs or back.
 type def_str = fn(ast.def_id) -> str;
 
-fn ty_str(@ty.t t, def_str ds) -> str {
+fn ty_str(ty.t t, def_str ds) -> str {
     ret sty_str(ty.struct(t), ds);
 }
 
@@ -91,7 +91,7 @@ fn sty_str(ty.sty st, def_str ds) -> str {
         case (ty.ty_str) {ret "s";}
         case (ty.ty_tag(?def,?tys)) { // TODO restore def_id
             auto acc = "t[" + ds(def) + "|";
-            for (@ty.t t in tys) {acc += ty_str(t, ds);}
+            for (ty.t t in tys) {acc += ty_str(t, ds);}
             ret acc + "]";
         }
         case (ty.ty_box(?mt)) {ret "@" + mt_str(mt, ds);}
@@ -151,7 +151,7 @@ fn proto_str(ast.proto proto) -> str {
     }
 }
 
-fn ty_fn_str(vec[ty.arg] args, @ty.t out, def_str ds) -> str {
+fn ty_fn_str(vec[ty.arg] args, ty.t out, def_str ds) -> str {
     auto acc = "[";
     for (ty.arg arg in args) {
         if (arg.mode == ast.alias) {acc += "&";}
@@ -327,7 +327,7 @@ fn encode_variant_id(&ebml.writer ebml_w, ast.def_id vid) {
     ebml.end_tag(ebml_w);
 }
 
-fn encode_type(&ebml.writer ebml_w, @ty.t typ) {
+fn encode_type(&ebml.writer ebml_w, ty.t typ) {
     ebml.start_tag(ebml_w, tag_items_data_item_type);
     auto f = def_to_str;
     ebml_w.writer.write(_str.bytes(ty_str(typ, f)));