review comments

Author: estebank

src/libsyntax/ast.rs

@@ -1300,11 +1300,6 @@ impl LitKind {
         }
     }
 
-    /// Returns a `LitKind::ByteStr` from `content`.
-    pub fn new_byte_str(content: Vec<u8>) -> LitKind {
-        LitKind::ByteStr(Lrc::new(content))
-    }
-
     /// Returns true if this is a numeric literal.
     pub fn is_numeric(&self) -> bool {
         match *self {

src/libsyntax/ext/build.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use rustc_data_structures::sync::Lrc;
 use rustc_target::spec::abi::Abi;
 use ast::{self, Ident, Generics, Expr, BlockCheckMode, UnOp, PatKind};
 use attr;
@@ -145,6 +146,7 @@ pub trait AstBuilder {
     fn expr_vec_ng(&self, sp: Span) -> P<ast::Expr>;
     fn expr_vec_slice(&self, sp: Span, exprs: Vec<P<ast::Expr>>) -> P<ast::Expr>;
     fn expr_str(&self, sp: Span, s: Symbol) -> P<ast::Expr>;
+    fn expr_byte_str(&self, sp: Span, byte_str: Vec<u8>) -> P<ast::Expr>;
 
     fn expr_some(&self, sp: Span, expr: P<ast::Expr>) -> P<ast::Expr>;
     fn expr_none(&self, sp: Span) -> P<ast::Expr>;
@@ -736,6 +738,10 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
         self.expr_lit(sp, ast::LitKind::Str(s, ast::StrStyle::Cooked))
     }
 
+    fn expr_byte_str(&self, sp: Span, byte_str: Vec<u8>) -> P<ast::Expr> {
+        self.expr_lit(sp, ast::LitKind::ByteStr(Lrc::new(byte_str)))
+    }
+
     fn expr_cast(&self, sp: Span, expr: P<ast::Expr>, ty: P<ast::Ty>) -> P<ast::Expr> {
         self.expr(sp, ast::ExprKind::Cast(expr, ty))
     }

src/libsyntax_ext/concat.rs

@@ -98,10 +98,7 @@ pub fn expand_syntax_ext(
     }
     let sp = sp.apply_mark(cx.current_expansion.mark);
     if b_accumulator.len() > 0 {
-        base::MacEager::expr(cx.expr_lit(
-            sp,
-            ast::LitKind::new_byte_str(b_accumulator),
-        ))
+        base::MacEager::expr(cx.expr_byte_str(sp, b_accumulator))
     } else {
         base::MacEager::expr(cx.expr_str(sp, Symbol::intern(&string_accumulator)))
     }