---

yaml
---
r: 12093
b: refs/heads/master
c: 0eae490
h: refs/heads/master
i:
  12091: d36f62a
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c56910fc9ac5120d8637d6121753e4dc1670a390
+refs/heads/master: 0eae4906693b21d837dd230e1d2104ae5c3c2dde
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/ty.rs

@@ -177,6 +177,12 @@ enum ast_ty_to_ty_cache_entry {
     atttce_resolved(t)  /* resolved to a type, irrespective of region */
 }
 
+enum borrowing {
+    bo_none,
+    bo_box(@borrowing),
+    bo_uniq(@borrowing)
+}
+
 type ctxt =
     @{interner: hashmap<intern_key, t_box>,
       mutable next_id: uint,
@@ -196,7 +202,8 @@ type ctxt =
       enum_var_cache: hashmap<def_id, @[variant_info]>,
       iface_method_cache: hashmap<def_id, @[method]>,
       ty_param_bounds: hashmap<ast::node_id, param_bounds>,
-      inferred_modes: hashmap<ast::node_id, ast::mode>};
+      inferred_modes: hashmap<ast::node_id, ast::mode>,
+      borrowings: hashmap<ast::node_id, borrowing>};
 
 type t_box = @{struct: sty,
                id: uint,
@@ -381,7 +388,8 @@ fn mk_ctxt(s: session::session, dm: resolve::def_map, amap: ast_map::map,
       enum_var_cache: new_def_hash(),
       iface_method_cache: new_def_hash(),
       ty_param_bounds: map::int_hash(),
-      inferred_modes: map::int_hash()}
+      inferred_modes: map::int_hash(),
+      borrowings: map::int_hash()}
 }