diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2015-09-24 18:00:08 +0300 |
|---|---|---|
| committer | Eduard Burtescu <edy.burt@gmail.com> | 2015-09-24 18:00:08 +0300 |
| commit | f293ea28b4beb5821feedc862619ec539f742cc3 (patch) | |
| tree | 4dae59234f4962fa2952b70995967c4792287a52 /src/libsyntax/print | |
| parent | 07ca1ab1ec32ac99a61312ec07d66db5f3657040 (diff) | |
| download | rust-f293ea28b4beb5821feedc862619ec539f742cc3.tar.gz rust-f293ea28b4beb5821feedc862619ec539f742cc3.zip | |
Remove the deprecated box(PLACE) syntax.
Diffstat (limited to 'src/libsyntax/print')
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index df72645f97d..6d3f036894f 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1811,13 +1811,12 @@ impl<'a> State<'a> { Ok(()) } - fn print_expr_box(&mut self, - place: &Option<P<ast::Expr>>, - expr: &ast::Expr) -> io::Result<()> { - try!(word(&mut self.s, "box")); - try!(word(&mut self.s, "(")); - try!(place.as_ref().map_or(Ok(()), |e|self.print_expr(&**e))); - try!(self.word_space(")")); + fn print_expr_in_place(&mut self, + place: &ast::Expr, + expr: &ast::Expr) -> io::Result<()> { + try!(self.word_space("in")); + try!(self.print_expr(place)); + try!(space(&mut self.s)); self.print_expr(expr) } @@ -1948,8 +1947,12 @@ impl<'a> State<'a> { try!(self.ibox(indent_unit)); try!(self.ann.pre(self, NodeExpr(expr))); match expr.node { - ast::ExprBox(ref place, ref expr) => { - try!(self.print_expr_box(place, &**expr)); + ast::ExprBox(ref expr) => { + try!(self.word_space("box")); + try!(self.print_expr(expr)); + } + ast::ExprInPlace(ref place, ref expr) => { + try!(self.print_expr_in_place(place, expr)); } ast::ExprVec(ref exprs) => { try!(self.print_expr_vec(&exprs[..])); |
