---

yaml
---
r: 14324
b: refs/heads/try
c: bfff2a8
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: dddd9908d537ce2858f37783779c3b88005ff0a8
+refs/heads/try: bfff2a8d55f8d96df77c7e496dc7713fe7faf5f9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/driver/driver.rs

@@ -159,7 +159,7 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
          bind middle::tstate::ck::check_crate(ty_cx, crate));
     let mut_map =
         time(time_passes, "mutability checking",
-             bind middle::mut::check_crate(ty_cx, crate));
+             bind middle::mutbl::check_crate(ty_cx, crate));
     let (copy_map, ref_map) =
         time(time_passes, "alias checking",
              bind middle::alias::check_crate(ty_cx, crate));

branches/try/src/comp/front/test.rs

@@ -256,7 +256,7 @@ fn mk_test_desc_vec_ty(cx: test_ctxt) -> @ast::ty {
     let test_desc_ty: ast::ty =
         nospan(ast::ty_path(test_desc_ty_path, cx.sess.next_node_id()));
 
-    let vec_mt: ast::mt = {ty: @test_desc_ty, mut: ast::imm};
+    let vec_mt: ast::mt = {ty: @test_desc_ty, mutbl: ast::m_imm};
 
     ret @nospan(ast::ty_vec(vec_mt));
 }
@@ -270,7 +270,7 @@ fn mk_test_desc_vec(cx: test_ctxt) -> @ast::expr {
     }
 
     ret @{id: cx.sess.next_node_id(),
-          node: ast::expr_vec(descs, ast::imm),
+          node: ast::expr_vec(descs, ast::m_imm),
           span: dummy_sp()};
 }
 
@@ -288,7 +288,7 @@ fn mk_test_desc_rec(cx: test_ctxt, test: test) -> @ast::expr {
          span: span};
 
     let name_field: ast::field =
-        nospan({mut: ast::imm, ident: "name", expr: @name_expr});
+        nospan({mutbl: ast::m_imm, ident: "name", expr: @name_expr});
 
     let fn_path = @nospan({global: false, idents: path, types: []});
 
@@ -300,7 +300,7 @@ fn mk_test_desc_rec(cx: test_ctxt, test: test) -> @ast::expr {
     let fn_wrapper_expr = mk_test_wrapper(cx, fn_expr, span);
 
     let fn_field: ast::field =
-        nospan({mut: ast::imm, ident: "fn", expr: fn_wrapper_expr});
+        nospan({mutbl: ast::m_imm, ident: "fn", expr: fn_wrapper_expr});
 
     let ignore_lit: ast::lit = nospan(ast::lit_bool(test.ignore));
 
@@ -310,7 +310,7 @@ fn mk_test_desc_rec(cx: test_ctxt, test: test) -> @ast::expr {
          span: span};
 
     let ignore_field: ast::field =
-        nospan({mut: ast::imm, ident: "ignore", expr: @ignore_expr});
+        nospan({mutbl: ast::m_imm, ident: "ignore", expr: @ignore_expr});
 
     let fail_lit: ast::lit = nospan(ast::lit_bool(test.should_fail));
 
@@ -320,7 +320,7 @@ fn mk_test_desc_rec(cx: test_ctxt, test: test) -> @ast::expr {
          span: span};
 
     let fail_field: ast::field =
-        nospan({mut: ast::imm, ident: "should_fail", expr: @fail_expr});
+        nospan({mutbl: ast::m_imm, ident: "should_fail", expr: @fail_expr});
 
     let desc_rec_: ast::expr_ =
         ast::expr_rec([name_field, fn_field, ignore_field, fail_field],
@@ -378,7 +378,7 @@ fn mk_test_wrapper(cx: test_ctxt,
 fn mk_main(cx: test_ctxt) -> @ast::item {
     let str_pt = @nospan({global: false, idents: ["str"], types: []});
     let str_ty = @nospan(ast::ty_path(str_pt, cx.sess.next_node_id()));
-    let args_mt: ast::mt = {ty: str_ty, mut: ast::imm};
+    let args_mt: ast::mt = {ty: str_ty, mutbl: ast::m_imm};
     let args_ty: ast::ty = nospan(ast::ty_vec(args_mt));
 
     let args_arg: ast::arg =

branches/try/src/comp/metadata/astencode.rs

@@ -483,28 +483,28 @@ impl ast_output for ast_ctxt {
                 self.tag(at_ty_bot) {||}
               }
 
-              ty_box({ty: ty, mut: m}) {
+              ty_box({ty: ty, mutbl: m}) {
                 self.tag(at_ty_box) {||
                     self.ty(ty);
                     self.mutbl(m);
                 }
               }
 
-              ty_uniq({ty: ty, mut: m}) {
+              ty_uniq({ty: ty, mutbl: m}) {
                 self.tag(at_ty_uniq) {||
                     self.ty(ty);
                     self.mutbl(m);
                 }
               }
 
-              ty_vec({ty: ty, mut: m}) {
+              ty_vec({ty: ty, mutbl: m}) {
                 self.tag(at_ty_vec) {||
                     self.ty(ty);
                     self.mutbl(m);
                 }
               }
 
-              ty_ptr({ty: ty, mut: m}) {
+              ty_ptr({ty: ty, mutbl: m}) {
                 self.tag(at_ty_ptr) {||
                     self.ty(ty);
                     self.mutbl(m);

branches/try/src/comp/metadata/tydecode.rs

@@ -311,11 +311,11 @@ fn parse_ty(st: @pstate, conv: conv_did) -> ty::t {
 fn parse_mt(st: @pstate, conv: conv_did) -> ty::mt {
     let m;
     alt peek(st) {
-      'm' { next(st); m = ast::mut; }
-      '?' { next(st); m = ast::maybe_mut; }
-      _ { m = ast::imm; }
+      'm' { next(st); m = ast::m_mutbl; }
+      '?' { next(st); m = ast::m_const; }
+      _ { m = ast::m_imm; }
     }
-    ret {ty: parse_ty(st, conv), mut: m};
+    ret {ty: parse_ty(st, conv), mutbl: m};
 }
 
 fn parse_def(st: @pstate, conv: conv_did) -> ast::def_id {
@@ -356,7 +356,7 @@ fn parse_ty_fn(st: @pstate, conv: conv_did) -> ty::fn_ty {
     let inputs: [ty::arg] = [];
     while peek(st) != ']' {
         let mode = alt check peek(st) {
-          '&' { ast::by_mut_ref }
+          '&' { ast::by_mutbl_ref }
           '-' { ast::by_move }
           '+' { ast::by_copy }
           '=' { ast::by_ref }

branches/try/src/comp/metadata/tyencode.rs

@@ -85,10 +85,10 @@ fn enc_ty(w: io::writer, cx: @ctxt, t: ty::t) {
     }
 }
 fn enc_mt(w: io::writer, cx: @ctxt, mt: ty::mt) {
-    alt mt.mut {
-      imm { }
-      mut { w.write_char('m'); }
-      maybe_mut { w.write_char('?'); }
+    alt mt.mutbl {
+      m_imm { }
+      m_mutbl { w.write_char('m'); }
+      m_const { w.write_char('?'); }
     }
     enc_ty(w, cx, mt.ty);
 }
@@ -215,7 +215,7 @@ fn enc_ty_fn(w: io::writer, cx: @ctxt, ft: ty::fn_ty) {
     w.write_char('[');
     for arg: ty::arg in ft.inputs {
         alt ty::resolved_mode(cx.tcx, arg.mode) {
-          by_mut_ref { w.write_char('&'); }
+          by_mutbl_ref { w.write_char('&'); }
           by_move { w.write_char('-'); }
           by_copy { w.write_char('+'); }
           by_ref { w.write_char('='); }