finish parts 12, 13

[rust-101.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 4ecf632498c9cb1208ad451b1df948c8424a6217..0aa0429c6fec97448dca8f972e08dd44d6393d26 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,11 +25,11 @@
 // dispatch), which makes it possible to construct abstractions that carry no run-time
 // cost. This is combined with the comfort of high-level functional languages and guaranteed
 // safety (as in, the program will not crash). The vast majority of existing
-// languages sacrificies one of these goals for the other. In particular, the
+// languages sacrifices one of these goals for the other. In particular, the
 // first requirement rules out a garbage collector: Rust can run "bare metal".
 // In fact, Rust rules out more classes of bugs than languages that achieve safety
 // with a GC: Besides dangling pointers and double-free, Rust also prevents issues
-// such as iterator invalidation and race conditions.
+// such as iterator invalidation and data races.
 // 
 // 
 // Getting started
@@ -42,14 +42,17 @@
 // This will also install `cargo`, the tool responsible for building rust projects (or *crates*).
 
 // Next, fetch the Rust-101 source code from the [git repository](http://www.ralfj.de/git/rust-101.git)
-// (also available [on GitHub](https://github.com/RalfJung/rust-101), and as [zip archive](https://github.com/RalfJung/rust-101/archive/master.zip)).
+// (also available [on GitHub](https://github.com/RalfJung/rust-101), and as a
+// [zip archive](https://github.com/RalfJung/rust-101/archive/master.zip) in case you don't have git installed).
+// 
 // There is a workspace prepared for you in the `workspace` folder. I suggest you copy this
 // folder somewhere else - that will make it much easier to later update the course without
 // overwriting your changes. Try `cargo build` in that new folder to check that compiling your workspace succeeds.
 // (You can also execute it with `cargo run`, but you'll need to do some work before this will succeed.)
 // 
-// If you later want to update the course, do `git pull` (or re-download the tip archive).
-// Then copy the files from `workspace/src/` to your workspace that you did not yet work on. (Of course you can also
+// If you later want to update the course, do `git pull` (or re-download the zip archive).
+// Then copy the files from `workspace/src/` to your workspace that you did not yet work on. Definitely
+// copy `main.rs` to make sure all the new files are actually compiled. (Of course you can also
 // copy the rest, but that would replace all your hard work by the original files with all the holes!)
 
 // Course Content
@@ -72,8 +75,15 @@
 // * [Part 05: Clone](part05.html)
 // * [Part 06: Copy, Lifetimes](part06.html)
 // * [Part 07: Operator Overloading, Tests, Formating](part07.html)
+// * [Part 08: Associated Types, Modules](part08.html)
+// * [Part 09: Iterators](part09.html)
+// * [Part 10: Closures](part10.html)
+// * [Part 11: Trait Objects, Box, Rc, Lifetime bounds](part11.html)
+// * [Part 12: Concurrency, Send](part12.html)
+// * [Part 13: Slices, Arrays, External Dependencies](part13.html)
 // * (to be continued)
-#![allow(dead_code, unused_imports, unused_variables, unused_mut)]
+#![allow(dead_code, unused_imports, unused_variables, unused_mut, unreachable_code)]
+/* extern crate docopt; */
 mod part00;
 mod part01;
 mod part02;
@@ -84,14 +94,18 @@ mod part06;
 mod part07;
 mod part08;
 mod part09;
+mod part10;
+mod part11;
+mod part12;
+mod part13;
 
 // To actually run the code of some part (after filling in the blanks, if necessary), simply edit the `main`
 // function.
-
 fn main() {
     part00::main();
 }
 
+
 // Additional material
 // -------------------
 //