Revert bytes!() docstring change, and fix a typo.

diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index dad162d82ad47b798c53fa0b91e99fcd66bdc850..58f65c90b3b105fecb1dd98d79ee601a97a81deb 100644 (file)
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -463,7 +463,7 @@ macro_rules! option_env( ($name:expr) => ({ /* compiler built-in */ }) )
     /// # 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 658c28f8202720977e7a826a178096c09c899aa3..ce13fa2a7c6eee50d99055d4bde4cb4806eee1f3 100644 (file)
--- 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) {