Implement type ascription.

Author: eddyb

src/librustc/lint/builtin.rs

@@ -1154,6 +1154,7 @@ impl UnusedParens {
                 }
                 ast::ExprUnary(_, ref x) |
                 ast::ExprCast(ref x, _) |
+                ast::ExprType(ref x, _) |
                 ast::ExprField(ref x, _) |
                 ast::ExprTupField(ref x, _) |
                 ast::ExprIndex(ref x, _) => {

src/librustc/middle/cfg/construct.rs

@@ -434,6 +434,7 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
             ast::ExprBox(None, ref e) |
             ast::ExprAddrOf(_, ref e) |
             ast::ExprCast(ref e, _) |
+            ast::ExprType(ref e, _) |
             ast::ExprUnary(_, ref e) |
             ast::ExprParen(ref e) |
             ast::ExprField(ref e, _) |

src/librustc/middle/check_const.rs

@@ -167,6 +167,7 @@ fn check_expr(v: &mut CheckCrateVisitor, e: &ast::Expr) {
         ast::ExprTupField(..) |
         ast::ExprIndex(..) |
         ast::ExprTup(..) |
+        ast::ExprType(..) |
         ast::ExprRepeat(..) |
         ast::ExprStruct(..) => {}
 

src/librustc/middle/const_eval.rs

@@ -232,8 +232,8 @@ impl<'a, 'tcx> ConstEvalVisitor<'a, 'tcx> {
                 }
             }
 
-            ast::ExprField(ref base, _) => self.classify(&**base),
-
+            ast::ExprType(ref base, _) |
+            ast::ExprField(ref base, _) |
             ast::ExprTupField(ref base, _) => self.classify(&**base),
 
             ast::ExprIndex(ref base, ref idx) =>
@@ -556,7 +556,8 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result<const_val, St
           }
       }
       ast::ExprLit(ref lit) => Ok(lit_to_const(&**lit)),
-      ast::ExprParen(ref e)     => eval_const_expr_partial(tcx, &**e),
+      ast::ExprParen(ref e) |
+      ast::ExprType(ref e, _) => eval_const_expr_partial(tcx, &**e),
       ast::ExprBlock(ref block) => {
         match block.expr {
             Some(ref expr) => eval_const_expr_partial(tcx, &**expr),

src/librustc/middle/expr_use_visitor.rs

@@ -423,7 +423,8 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,'tcx,TYPER> {
         self.walk_adjustment(expr);
 
         match expr.node {
-            ast::ExprParen(ref subexpr) => {
+            ast::ExprParen(ref subexpr) |
+            ast::ExprType(ref subexpr, _) => {
                 self.walk_expr(&**subexpr)
             }
 

src/librustc/middle/liveness.rs

@@ -505,7 +505,7 @@ fn visit_expr(ir: &mut IrMaps, expr: &Expr) {
       ast::ExprBlock(..) | ast::ExprAssign(..) | ast::ExprAssignOp(..) |
       ast::ExprMac(..) | ast::ExprStruct(..) | ast::ExprRepeat(..) |
       ast::ExprParen(..) | ast::ExprInlineAsm(..) | ast::ExprBox(..) |
-      ast::ExprRange(..) => {
+      ast::ExprRange(..) | ast::ExprType(..) => {
           visit::walk_expr(ir, expr);
       }
     }
@@ -1188,6 +1188,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
           ast::ExprBox(None, ref e) |
           ast::ExprAddrOf(_, ref e) |
           ast::ExprCast(ref e, _) |
+          ast::ExprType(ref e, _) |
           ast::ExprUnary(_, ref e) |
           ast::ExprParen(ref e) => {
             self.propagate_through_expr(&**e, succ)
@@ -1468,7 +1469,7 @@ fn check_expr(this: &mut Liveness, expr: &Expr) {
       ast::ExprBlock(..) | ast::ExprMac(..) | ast::ExprAddrOf(..) |
       ast::ExprStruct(..) | ast::ExprRepeat(..) | ast::ExprParen(..) |
       ast::ExprClosure(..) | ast::ExprPath(..) | ast::ExprBox(..) |
-      ast::ExprRange(..) | ast::ExprQPath(..) => {
+      ast::ExprRange(..) | ast::ExprQPath(..) | ast::ExprType(..) => {
         visit::walk_expr(this, expr);
       }
       ast::ExprIfLet(..) => {

src/librustc/middle/mem_categorization.rs

@@ -520,7 +520,7 @@ impl<'t,'tcx,TYPER:Typer<'tcx>> MemCategorizationContext<'t,TYPER> {
             self.cat_def(expr.id, expr.span, expr_ty, def)
           }
 
-          ast::ExprParen(ref e) => {
+          ast::ExprParen(ref e) | ast::ExprType(ref e, _) => {
             self.cat_expr(&**e)
           }
 

src/librustc/middle/ty.rs

@@ -4618,7 +4618,8 @@ pub fn expr_kind(tcx: &ctxt, expr: &ast::Expr) -> ExprKind {
             }
         }
 
-        ast::ExprParen(ref e) => expr_kind(tcx, &**e),
+        ast::ExprParen(ref e) |
+        ast::ExprType(ref e, _) => expr_kind(tcx, &**e),
 
         ast::ExprMac(..) => {
             tcx.sess.span_bug(

src/librustc_back/svh.rs

@@ -235,6 +235,7 @@ mod svh_visitor {
         SawExprUnary(ast::UnOp),
         SawExprLit(ast::Lit_),
         SawExprCast,
+        SawExprType,
         SawExprIf,
         SawExprWhile,
         SawExprMatch,
@@ -265,6 +266,7 @@ mod svh_visitor {
             ExprUnary(op, _)         => SawExprUnary(op),
             ExprLit(ref lit)         => SawExprLit(lit.node.clone()),
             ExprCast(..)             => SawExprCast,
+            ExprType(..)             => SawExprType,
             ExprIf(..)               => SawExprIf,
             ExprWhile(..)            => SawExprWhile,
             ExprLoop(_, id)          => SawExprLoop(id.map(content)),

src/librustc_trans/trans/consts.rs

@@ -663,7 +663,8 @@ fn const_expr_unadjusted(cx: &CrateContext, e: &ast::Expr) -> ValueRef {
                   _ => cx.sess().span_bug(e.span, "expected a struct or variant def")
               }
           }
-          ast::ExprParen(ref e) => const_expr(cx, &**e).0,
+          ast::ExprParen(ref e) |
+          ast::ExprType(ref e, _) => const_expr(cx, &**e).0,
           ast::ExprBlock(ref block) => {
             match block.expr {
                 Some(ref expr) => const_expr(cx, &**expr).0,