From: Manish Goregaokar Date: Sat, 11 Apr 2015 13:35:09 +0000 (+0530) Subject: Rollup merge of #24281 - steveklabnik:lol_editing, r=alexcrichton X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=df8360f4fc068930bae19cbc173c10235b56dfc5;p=rust.git Rollup merge of #24281 - steveklabnik:lol_editing, r=alexcrichton more more more --- df8360f4fc068930bae19cbc173c10235b56dfc5 diff --cc src/doc/trpl/SUMMARY.md index 029facdec76,fb042b2704b..f2d1666048d --- a/src/doc/trpl/SUMMARY.md +++ b/src/doc/trpl/SUMMARY.md @@@ -14,27 -14,29 +14,27 @@@ * [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)