]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #24281 - steveklabnik:lol_editing, r=alexcrichton
authorManish Goregaokar <manishsmail@gmail.com>
Sat, 11 Apr 2015 13:35:09 +0000 (19:05 +0530)
committerManish Goregaokar <manishsmail@gmail.com>
Sat, 11 Apr 2015 13:35:09 +0000 (19:05 +0530)
 more more more

1  2 
src/doc/trpl/SUMMARY.md

index 029facdec762b3a0dd8d610b369f97aea01cab73,fb042b2704b6bf3680ad20758f683a6182f7088c..f2d1666048d89773cb3a5745616edc4e0dc7d30f
      * [Concurrency](concurrency.md)
      * [Error Handling](error-handling.md)
      * [FFI](ffi.md)
-     * [`Deref` coercions](deref-coercions.md)
+     * [Deref coercions](deref-coercions.md)
  * [Syntax and Semantics](syntax-and-semantics.md)
      * [Variable Bindings](variable-bindings.md)
 -    * [Primitive Types](primitive-types.md)
      * [Functions](functions.md)
 +    * [Primitive Types](primitive-types.md)
      * [Comments](comments.md)
-     * [Structs](structs.md)
-     * [Mutability](mutability.md)
-     * [Method Syntax](method-syntax.md)
-     * [Enums](enums.md)
-     * [`if`](if.md)
-     * [Match](match.md)
-     * [Patterns](patterns.md)
-     * [`for` loops](for-loops.md)
-     * [`while` loops](while-loops.md)
+     * [if](if.md)
+     * [for loops](for-loops.md)
+     * [while loops](while-loops.md)
      * [Ownership](ownership.md)
      * [References and Borrowing](references-and-borrowing.md)
      * [Lifetimes](lifetimes.md)
+     * [Mutability](mutability.md)
      * [Move semantics](move-semantics.md)
+     * [Enums](enums.md)
+     * [Match](match.md)
+     * [Patterns](patterns.md)
+     * [Structs](structs.md)
+     * [Method Syntax](method-syntax.md)
      * [Drop](drop.md)
      * [Vectors](vectors.md)
 -    * [Arrays](arrays.md)
 -    * [Slices](slices.md)
      * [Strings](strings.md)
      * [Traits](traits.md)
      * [Operators and Overloading](operators-and-overloading.md)
@@@ -63,5 -67,5 +64,6 @@@
      * [Link args](link-args.md)
      * [Benchmark Tests](benchmark-tests.md)
      * [Box Syntax and Patterns](box-syntax-and-patterns.md)
+     * [Slice Patterns](slice-patterns.md)
  * [Glossary](glossary.md)
 +* [Academic Research](academic-research.md)