about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-27 11:26:25 +0000
committerbors <bors@rust-lang.org>2014-06-27 11:26:25 +0000
commitb66c59ee5ab63e3573d96568a1e15dcc977b8333 (patch)
tree8cf7c7e74e879c3fe139aefaa48ef7f90b569d3d /src
parent17021944be992f0895127e806806a482121bd2a7 (diff)
parentafdb19b3b5df42264b90ac98d92df24e92dc5982 (diff)
downloadrust-b66c59ee5ab63e3573d96568a1e15dcc977b8333.tar.gz
rust-b66c59ee5ab63e3573d96568a1e15dcc977b8333.zip
auto merge of #15211 : steveklabnik/rust/guide_skeleton, r=huonw
This diff will look better once bors takes care of https://github.com/rust-lang/rust/pull/15183

@brson and I talked about it, and, if I commit this skeleton, I can submit PRs for each portion, without doing this silly "builds on previous PRs" stuff, and it shouldn't cause conflicts.

This lays out what I think the guide should cover, and in what order.  I haven't picked a cohesive project yet that shows all this off, but I think this progression of concepts is appropriate.
Diffstat (limited to 'src')
-rw-r--r--src/doc/guide.md61
1 files changed, 61 insertions, 0 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md
index fd7846386ed..bf54b3dc6a4 100644
--- a/src/doc/guide.md
+++ b/src/doc/guide.md
@@ -411,3 +411,64 @@ rest of your Rust career.
 
 Next, we'll learn more about Rust itself, by starting to write a more complicated
 program. We hope you want to do more with Rust than just print "Hello, world!"
+
+## If
+
+## Functions
+
+return
+
+comments
+
+## Testing
+
+attributes
+
+stability markers
+
+## Crates and Modules
+
+visibility
+
+## Compound Data Types
+
+Tuples
+
+Structs
+
+Enums
+
+## Match
+
+## Looping
+
+for
+
+while
+
+loop
+
+break/continue
+
+iterators
+
+## Lambdas
+
+## Generics
+
+## Traits
+
+## Operators and built-in Traits
+
+## Ownership and Lifetimes
+
+Move vs. Copy
+
+Allocation
+
+## Tasks
+
+## Macros
+
+## Unsafe
+