about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-10-28 20:27:35 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-10-28 20:27:35 -0400
commit0809eaa7c05bdaef3fdd5efebdd3ff280a21668c (patch)
tree57624c533010f49393f94dd0b75400535945129c /src
parent319e97bfcf8a995f549d79d9c80d0df17587e643 (diff)
parent14eef41378d6137cf67b903f8f3167d5b60f4964 (diff)
downloadrust-0809eaa7c05bdaef3fdd5efebdd3ff280a21668c.tar.gz
rust-0809eaa7c05bdaef3fdd5efebdd3ff280a21668c.zip
Rollup merge of #29438 - jethrogb:topic/book-rbstrlit, r=alexcrichton
The raw byte string literal syntax in the syntax index was incorrect. Also added links to the reference for raw and/or byte string literals.
Diffstat (limited to 'src')
-rw-r--r--src/doc/trpl/syntax-index.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/doc/trpl/syntax-index.md b/src/doc/trpl/syntax-index.md
index 0353fa9f39d..d0b46ed3719 100644
--- a/src/doc/trpl/syntax-index.md
+++ b/src/doc/trpl/syntax-index.md
@@ -100,9 +100,9 @@
 * `'ident`: named lifetime or loop label.  See [Lifetimes], [Loops (Loops Labels)].
 * `…u8`, `…i32`, `…f64`, `…usize`, …: numeric literal of specific type.
 * `"…"`: string literal.  See [Strings].
-* `r"…"`, `r#"…"#`, `r##"…"##`, …: raw string literal.
-* `b"…"`: byte string literal.
-* `rb"…"`, `rb#"…"#`, `rb##"…"##`, …: raw byte string literal.
+* `r"…"`, `r#"…"#`, `r##"…"##`, …: raw string literal, escape characters are not processed. See [Reference (Raw String Literals)].
+* `b"…"`: byte string literal, constructs a `[u8]` instead of a string. See [Reference (Byte String Literals)].
+* `br"…"`, `br#"…"#`, `br##"…"##`, …: raw byte string literal, combination of raw and byte string literal. See [Reference (Raw Byte String Literals)].
 * `'…'`: character literal.  See [Primitive Types (`char`)].
 * `b'…'`: ASCII byte literal.
 
@@ -219,6 +219,9 @@
 [Primitive Types (Tuple Indexing)]: primitive-types.html#tuple-indexing
 [Primitive Types (Tuples)]: primitive-types.html#tuples
 [Raw Pointers]: raw-pointers.html
+[Reference (Byte String Literals)]: ../reference.html#byte-string-literals
+[Reference (Raw Byte String Literals)]: ../reference.html#raw-byte-string-literals
+[Reference (Raw String Literals)]: ../reference.html#raw-string-literals
 [References and Borrowing]: references-and-borrowing.html
 [Strings]: strings.html
 [Structs (Update syntax)]: structs.html#update-syntax