From 060a84d1f7fee5585aa6ebc50c74b0b35f2c0283 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Thu, 23 Jun 2016 23:26:32 +0000
Subject: Refactor away duplicate method `ecx.block_all()`

---
 src/libsyntax/ext/build.rs | 9 ++-------
 src/libsyntax/ext/quote.rs | 6 +++---
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/libsyntax/ext')

diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs
index 1a01fa2e9e0..480a0894201 100644
--- a/src/libsyntax/ext/build.rs
+++ b/src/libsyntax/ext/build.rs
@@ -100,7 +100,6 @@ pub trait AstBuilder {
     // blocks
     fn block(&self, span: Span, stmts: Vec<ast::Stmt>) -> P<ast::Block>;
     fn block_expr(&self, expr: P<ast::Expr>) -> P<ast::Block>;
-    fn block_all(&self, span: Span, stmts: Vec<ast::Stmt>) -> P<ast::Block>;
 
     // expressions
     fn expr(&self, span: Span, node: ast::ExprKind) -> P<ast::Expr>;
@@ -553,22 +552,18 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
         P(respan(sp, ast::StmtKind::Decl(P(decl), ast::DUMMY_NODE_ID)))
     }
 
-    fn block(&self, span: Span, stmts: Vec<ast::Stmt>) -> P<ast::Block> {
-        self.block_all(span, stmts)
-    }
-
     fn stmt_item(&self, sp: Span, item: P<ast::Item>) -> ast::Stmt {
         let decl = respan(sp, ast::DeclKind::Item(item));
         respan(sp, ast::StmtKind::Decl(P(decl), ast::DUMMY_NODE_ID))
     }
 
     fn block_expr(&self, expr: P<ast::Expr>) -> P<ast::Block> {
-        self.block_all(expr.span, vec![Spanned {
+        self.block(expr.span, vec![Spanned {
             span: expr.span,
             node: ast::StmtKind::Expr(expr, ast::DUMMY_NODE_ID),
         }])
     }
-    fn block_all(&self, span: Span, stmts: Vec<ast::Stmt>) -> P<ast::Block> {
+    fn block(&self, span: Span, stmts: Vec<ast::Stmt>) -> P<ast::Block> {
         P(ast::Block {
            stmts: stmts,
            id: ast::DUMMY_NODE_ID,
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs
index b1290451cbf..74a88842d22 100644
--- a/src/libsyntax/ext/quote.rs
+++ b/src/libsyntax/ext/quote.rs
@@ -513,7 +513,7 @@ pub fn expand_quote_matcher(cx: &mut ExtCtxt,
     let mut vector = mk_stmts_let(cx, sp);
     vector.extend(statements_mk_tts(cx, &tts[..], true));
     vector.push(cx.stmt_expr(cx.expr_ident(sp, id_ext("tt"))));
-    let block = cx.expr_block(cx.block_all(sp, vector));
+    let block = cx.expr_block(cx.block(sp, vector));
 
     let expanded = expand_wrapper(cx, sp, cx_expr, block, &[&["syntax", "ext", "quote", "rt"]]);
     base::MacEager::expr(expanded)
@@ -884,7 +884,7 @@ fn expand_tts(cx: &ExtCtxt, sp: Span, tts: &[TokenTree])
     let mut vector = mk_stmts_let(cx, sp);
     vector.extend(statements_mk_tts(cx, &tts[..], false));
     vector.push(cx.stmt_expr(cx.expr_ident(sp, id_ext("tt"))));
-    let block = cx.expr_block(cx.block_all(sp, vector));
+    let block = cx.expr_block(cx.block(sp, vector));
 
     (cx_expr, block)
 }
@@ -905,7 +905,7 @@ fn expand_wrapper(cx: &ExtCtxt,
     }).chain(Some(stmt_let_ext_cx)).collect::<Vec<_>>();
     stmts.push(cx.stmt_expr(expr));
 
-    cx.expr_block(cx.block_all(sp, stmts))
+    cx.expr_block(cx.block(sp, stmts))
 }
 
 fn expand_parse_call(cx: &ExtCtxt,
-- 
cgit 1.4.1-3-g733a5