about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2014-06-19 00:59:40 +0200
committerAlex Crichton <alex@alexcrichton.com>2014-06-18 17:02:23 -0700
commit72f0d4535715505c1cc429ef277a954ba26366bd (patch)
tree505649331ca09c8c98d38beb2e0e173d53d915f8
parent108b8b6dc707775bd54aeea7820e0d473f556718 (diff)
downloadrust-72f0d4535715505c1cc429ef277a954ba26366bd.tar.gz
rust-72f0d4535715505c1cc429ef277a954ba26366bd.zip
Revert bytes!() docstring change, and fix a typo.
-rw-r--r--src/libstd/macros.rs2
-rw-r--r--src/libsyntax/ext/bytes.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index dad162d82ad..58f65c90b3b 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -463,7 +463,7 @@ pub mod builtin {
     /// # Example
     ///
     /// ```
-    /// let rust = b"rust\xFF";
+    /// let rust = bytes!("r", 'u', "st", 255);
     /// assert_eq!(rust[1], 'u' as u8);
     /// assert_eq!(rust[4], 255);
     /// ```
diff --git a/src/libsyntax/ext/bytes.rs b/src/libsyntax/ext/bytes.rs
index 658c28f8202..ce13fa2a7c6 100644
--- a/src/libsyntax/ext/bytes.rs
+++ b/src/libsyntax/ext/bytes.rs
@@ -25,7 +25,7 @@ pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
          for documentation");
     cx.parse_sess.span_diagnostic.span_note(sp,
         "see https://github.com/rust-lang/rust/blob/master/src/etc/2014-06-rewrite-bytes-macros.py \
-         for a automated migration");
+         for an automated migration");
 
     // Gather all argument expressions
     let exprs = match get_exprs_from_tts(cx, sp, tts) {