]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #23185 - steveklabnik:gh20051, r=alexcrichton
authorManish Goregaokar <manishsmail@gmail.com>
Tue, 10 Mar 2015 09:29:39 +0000 (14:59 +0530)
committerManish Goregaokar <manishsmail@gmail.com>
Tue, 10 Mar 2015 09:29:39 +0000 (14:59 +0530)
 Fixes #20051

1  2 
src/doc/reference.md

diff --combined src/doc/reference.md
index ee5ebfc7e88a59f38a31aee878aaa8a68ada75c7,6eab5d255b62bf863500e76711fd7179618d1756..4f5f2a631adef5ba8e27c8858f72e861b2572f05
@@@ -229,14 -229,14 +229,14 @@@ cases mentioned in [Number literals](#n
  
  ##### Characters and strings
  
- |   | Example | Number of `#` pairs allowed | Available characters | Escapes | Equivalent to |
- |---|---------|-----------------------------|----------------------|---------|---------------|
- | [Character](#character-literals) | `'H'` | `N/A` | All unicode | `\'` & [Byte escapes](#byte-escapes) & [Unicode escapes](#unicode-escapes) | `N/A` |
- | [String](#string-literals) | `"hello"` | `N/A` | All unicode | `\"` & [Byte escapes](#byte-escapes) & [Unicode escapes](#unicode-escapes) | `N/A` |
- | [Raw](#raw-string-literals) | `r##"hello"##`  | `0...` | All unicode | `N/A` | `N/A` |
- | [Byte](#byte-literals) | `b'H'` | `N/A` | All ASCII | `\'` & [Byte escapes](#byte-escapes) | `u8` |
- | [Byte string](#byte-string-literals) | `b"hello"` | `N/A`  | All ASCII | `\"` & [Byte escapes](#byte-escapes) | `&'static [u8]` |
- | [Raw byte string](#raw-byte-string-literals) | `br##"hello"##` | `0...` | All ASCII | `N/A` | `&'static [u8]` (unsure...not stated) |
+ |                                              | Example       | # sets | Characters  | Escapes             |
+ |----------------------------------------------|---------------|--------|-------------|---------------------|
+ | [Character](#character-literals)             | 'H'           | N/A    | All Unicode | \' & [Byte](#byte-escapes) & [Unicode](#unicode-escapes) |
+ | [String](#string-literals)                   | "hello"       | N/A    | All Unicode | \" & [Byte](#byte-escapes) & [Unicode](#unicode-escapes) |
+ | [Raw](#raw-string-literals)                  | r#"hello"#    | 0...   | All Unicode | N/A                                                      |
+ | [Byte](#byte-literals)                       | b'H'          | N/A    | All ASCII   | \' & [Byte](#byte-escapes)                               |
+ | [Byte string](#byte-string-literals)         | b"hello"      | N/A    | All ASCII   | \" & [Byte](#byte-escapes)                               |
+ | [Raw byte string](#raw-byte-string-literals) | br#"hello"#   | 0...   | All ASCII   | N/A                                                      |
  
  ##### Byte escapes
  
@@@ -2847,7 -2847,7 +2847,7 @@@ automatically dereferenced to make the 
  ### Array expressions
  
  ```{.ebnf .gram}
 -array_expr : '[' "mut" ? vec_elems? ']' ;
 +array_expr : '[' "mut" ? array_elems? ']' ;
  
  array_elems : [expr [',' expr]*] | [expr ';' expr] ;
  ```
@@@ -3007,6 -3007,10 +3007,6 @@@ A type cast expression is denoted with 
  Executing an `as` expression casts the value on the left-hand side to the type
  on the right-hand side.
  
 -A numeric value can be cast to any numeric type. A raw pointer value can be
 -cast to or from any integral type or raw pointer type. Any other cast is
 -unsupported and will fail to compile.
 -
  An example of an `as` expression:
  
  ```