mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #363 from marcusklaas/rustup35

Browse Source 
Adjust for changed representation of box expressions in AST
This commit is contained in:
Marcus Klaas de Vries 2015-09-25 13:28:09 +02:00
commit 4ccf420415
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/expr.rs
View File

@ -163,12 +163,15 @@ impl Rewrite for ast::Expr {
ast::Expr_::ExprRet(Some(ref expr)) => { ast::Expr_::ExprRet(Some(ref expr)) => {
rewrite_unary_prefix(context, "return ", &expr, width, offset) rewrite_unary_prefix(context, "return ", &expr, width, offset)
} }
ast::Expr_::ExprBox(ref expr) => {
rewrite_unary_prefix(context, "box ", &expr, width, offset)
}
ast::Expr_::ExprAddrOf(mutability, ref expr) => { ast::Expr_::ExprAddrOf(mutability, ref expr) => {
rewrite_expr_addrof(context, mutability, &expr, width, offset) rewrite_expr_addrof(context, mutability, &expr, width, offset)
} }
// We do not format these expressions yet, but they should still // We do not format these expressions yet, but they should still
// satisfy our width restrictions. // satisfy our width restrictions.
ast::Expr_::ExprBox(..) | ast::Expr_::ExprInPlace(..) |
ast::Expr_::ExprCast(..) | ast::Expr_::ExprCast(..) |
ast::Expr_::ExprIndex(..) | ast::Expr_::ExprIndex(..) |
ast::Expr_::ExprInlineAsm(..) | ast::Expr_::ExprInlineAsm(..) |
@ -1348,7 +1351,6 @@ fn rewrite_unary_op(context: &RewriteContext,
-> Option<String> { -> Option<String> {
// For some reason, an UnOp is not spanned like BinOp! // For some reason, an UnOp is not spanned like BinOp!
let operator_str = match *op { let operator_str = match *op {
ast::UnOp::UnUniq => "box ",
ast::UnOp::UnDeref => "*", ast::UnOp::UnDeref => "*",
ast::UnOp::UnNot => "!", ast::UnOp::UnNot => "!",
ast::UnOp::UnNeg => "-", ast::UnOp::UnNeg => "-",