about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2015-09-03 10:54:53 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2015-09-03 10:54:53 +0300
commit405c616eaf4e58a8bed67924c364c8e9c83b2581 (patch)
treea88bb7ef0691d3b97c24afe8b82f605b62252d66 /src/libsyntax/ext
parent69c3b39d0d7136aff5ddb6e4cb08db3dca0621fc (diff)
downloadrust-405c616eaf4e58a8bed67924c364c8e9c83b2581.tar.gz
rust-405c616eaf4e58a8bed67924c364c8e9c83b2581.zip
Use consistent terminology for byte string literals
Avoid confusion with binary integer literals and binary operator expressions in libsyntax
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/concat.rs4
-rw-r--r--src/libsyntax/ext/source_util.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ext/concat.rs b/src/libsyntax/ext/concat.rs
index 754c73a9d78..71430b7aad5 100644
--- a/src/libsyntax/ext/concat.rs
+++ b/src/libsyntax/ext/concat.rs
@@ -50,8 +50,8 @@ pub fn expand_syntax_ext(cx: &mut base::ExtCtxt,
                         accumulator.push_str(&format!("{}", b));
                     }
                     ast::LitByte(..) |
-                    ast::LitBinary(..) => {
-                        cx.span_err(e.span, "cannot concatenate a binary literal");
+                    ast::LitByteStr(..) => {
+                        cx.span_err(e.span, "cannot concatenate a byte string literal");
                     }
                 }
             }
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
index 8da36b2c1e1..25063e7b0d6 100644
--- a/src/libsyntax/ext/source_util.rs
+++ b/src/libsyntax/ext/source_util.rs
@@ -189,7 +189,7 @@ pub fn expand_include_bytes(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
             let filename = format!("{}", file.display());
             cx.codemap().new_filemap_and_lines(&filename, "");
 
-            base::MacEager::expr(cx.expr_lit(sp, ast::LitBinary(Rc::new(bytes))))
+            base::MacEager::expr(cx.expr_lit(sp, ast::LitByteStr(Rc::new(bytes))))
         }
     }
 }