Remove `be` keyword.

Closes #2227.

9 files changed, 9 insertions, 45 deletions

diff --git a/src/rustc/middle/borrowck.rs b/src/rustc/middle/borrowck.rs
index cd881f1c731..ed310495813 100644
--- a/src/rustc/middle/borrowck.rs
+++ b/src/rustc/middle/borrowck.rs
@@ -972,7 +972,7 @@ impl categorize_methods for borrowck_ctxt {
           ast::expr_swap(*) | ast::expr_move(*) | ast::expr_assign(*) |
           ast::expr_assign_op(*) | ast::expr_fn(*) | ast::expr_fn_block(*) |
           ast::expr_assert(*) | ast::expr_check(*) | ast::expr_ret(*) |
-          ast::expr_be(*) | ast::expr_loop_body(*) | ast::expr_unary(*) |
+          ast::expr_loop_body(*) | ast::expr_unary(*) |
           ast::expr_copy(*) | ast::expr_cast(*) | ast::expr_fail(*) |
           ast::expr_vstore(*) | ast::expr_vec(*) | ast::expr_tup(*) |
           ast::expr_if_check(*) | ast::expr_if(*) | ast::expr_log(*) |
diff --git a/src/rustc/middle/check_loop.rs b/src/rustc/middle/check_loop.rs
index b815afd3646..098ec82ac0a 100644
--- a/src/rustc/middle/check_loop.rs
+++ b/src/rustc/middle/check_loop.rs
@@ -44,12 +44,6 @@ fn check_crate(tcx: ty::ctxt, crate: @crate) {
                 }
                 visit::visit_expr_opt(oe, cx, v);
               }
-              expr_be(re) {
-                if !cx.can_ret {
-                    tcx.sess.span_err(e.span, "`be` in block function");
-                }
-                v.visit_expr(re, cx, v);
-              }
               _ { visit::visit_expr(e, cx, v); }
             }
         }
diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
index 9ef307e3ea7..cec6f197da8 100644
--- a/src/rustc/middle/trans/base.rs
+++ b/src/rustc/middle/trans/base.rs
@@ -3267,9 +3267,6 @@ fn trans_expr(bcx: block, e: @ast::expr, dest: dest) -> block {
         assert dest == ignore;
         ret trans_ret(bcx, ex);
       }
-      ast::expr_be(ex) {
-        ret trans_be(bcx, ex);
-      }
       ast::expr_fail(expr) {
         assert dest == ignore;
         ret trans_fail_expr(bcx, some(e.span), expr);
@@ -3641,13 +3638,6 @@ fn build_return(bcx: block) {
     Br(bcx, bcx.fcx.llreturn);
 }
 
-fn trans_be(cx: block, e: @ast::expr) -> block {
-    // FIXME: Turn this into a real tail call once
-    // calling convention issues are settled
-    let _icx = cx.insn_ctxt("trans_be");
-    ret trans_ret(cx, some(e));
-}
-
 fn init_local(bcx: block, local: @ast::local) -> block {
     let _icx = bcx.insn_ctxt("init_local");
     let ty = node_id_type(bcx, local.node.id);
diff --git a/src/rustc/middle/trans/type_use.rs b/src/rustc/middle/trans/type_use.rs
index 65cc2a949b5..38b0bd08697 100644
--- a/src/rustc/middle/trans/type_use.rs
+++ b/src/rustc/middle/trans/type_use.rs
@@ -172,7 +172,7 @@ fn mark_for_expr(cx: ctx, e: @expr) {
         }
       }
       expr_assign(val, _) | expr_swap(val, _) | expr_assign_op(_, val, _) |
-      expr_ret(some(val)) | expr_be(val) {
+      expr_ret(some(val)) {
         node_type_needs(cx, use_repr, val.id);
       }
       expr_index(base, _) | expr_field(base, _, _) {
diff --git a/src/rustc/middle/tstate/ann.rs b/src/rustc/middle/tstate/ann.rs
index 82388f9b89f..ab8c921a008 100644
--- a/src/rustc/middle/tstate/ann.rs
+++ b/src/rustc/middle/tstate/ann.rs
@@ -41,13 +41,15 @@ type pre_and_post_state = {prestate: prestate, poststate: poststate};
 
 type ts_ann = @{conditions: pre_and_post, states: pre_and_post_state};
 
-fn true_precond(num_vars: uint) -> precond { be create_tritv(num_vars); }
+fn true_precond(num_vars: uint) -> precond { ret create_tritv(num_vars); }
 
-fn true_postcond(num_vars: uint) -> postcond { be true_precond(num_vars); }
+fn true_postcond(num_vars: uint) -> postcond { ret true_precond(num_vars); }
 
-fn empty_prestate(num_vars: uint) -> prestate { be true_precond(num_vars); }
+fn empty_prestate(num_vars: uint) -> prestate { ret true_precond(num_vars); }
 
-fn empty_poststate(num_vars: uint) -> poststate { be true_precond(num_vars); }
+fn empty_poststate(num_vars: uint) -> poststate {
+    ret true_precond(num_vars);
+}
 
 fn false_postcond(num_vars: uint) -> postcond {
     let rslt = create_tritv(num_vars);
diff --git a/src/rustc/middle/tstate/pre_post_conditions.rs b/src/rustc/middle/tstate/pre_post_conditions.rs
index e5bcec7a46c..7b8c864580d 100644
--- a/src/rustc/middle/tstate/pre_post_conditions.rs
+++ b/src/rustc/middle/tstate/pre_post_conditions.rs
@@ -391,11 +391,6 @@ fn find_pre_post_expr(fcx: fn_ctxt, e: @expr) {
           }
         }
       }
-      expr_be(val) {
-        find_pre_post_expr(fcx, val);
-        set_pre_and_post(fcx.ccx, e.id, expr_prestate(fcx.ccx, val),
-                         false_postcond(num_local_vars));
-      }
       expr_if(antec, conseq, maybe_alt) {
         join_then_else(fcx, antec, conseq, maybe_alt, e.id, plain_if);
       }
diff --git a/src/rustc/middle/tstate/states.rs b/src/rustc/middle/tstate/states.rs
index 8fbdec3d9b5..4e484fccd07 100644
--- a/src/rustc/middle/tstate/states.rs
+++ b/src/rustc/middle/tstate/states.rs
@@ -483,14 +483,6 @@ fn find_pre_post_state_expr(fcx: fn_ctxt, pres: prestate, e: @expr) -> bool {
         }
         ret changed;
       }
-      expr_be(val) {
-        let mut changed = set_prestate_ann(fcx.ccx, e.id, pres);
-        let post = false_postcond(num_constrs);
-        // except for the "diverges" bit...
-        kill_poststate_(fcx, fcx.enclosing.i_diverge, post);
-        set_poststate_ann(fcx.ccx, e.id, post);
-        ret changed | find_pre_post_state_expr(fcx, pres, val);
-      }
       expr_if(antec, conseq, maybe_alt) {
         ret join_then_else(fcx, antec, conseq, maybe_alt, e.id, plain_if,
                            pres);
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs
index d6f59279028..09a1ef7c4c3 100644
--- a/src/rustc/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
@@ -1456,7 +1456,7 @@ fn is_instantiable(cx: ctxt, r_ty: t) -> bool {
           ty_box(mt) |
           ty_uniq(mt) |
           ty_rptr(_, mt) {
-            be type_requires(cx, seen, r_ty, mt.ty);
+            ret type_requires(cx, seen, r_ty, mt.ty);
           }
 
           ty_ptr(mt) {
diff --git a/src/rustc/middle/typeck.rs b/src/rustc/middle/typeck.rs
index 8d897161678..6f9b767a870 100644
--- a/src/rustc/middle/typeck.rs
+++ b/src/rustc/middle/typeck.rs
@@ -3364,15 +3364,6 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
         }
         fcx.write_bot(id);
       }
-      ast::expr_be(e) {
-        if !ast_util::is_call_expr(e) {
-           tcx.sess.span_err(expr.span,
-              "non-call expression in tail call");
-        }
-        check_expr_with(fcx, e, fcx.ret_ty);
-        bot = true;
-        fcx.write_nil(id);
-      }
       ast::expr_log(_, lv, e) {
         bot = check_expr_with(fcx, lv, ty::mk_mach_uint(tcx, ast::ty_u32));
         // Note: this does not always execute, so do not propagate bot: