X-Git-Url: https://git.ralfj.de/rust-101.git/blobdiff_plain/3192415c398766f2dba869c6a3c6dad69f300cd7..20c3754739514b710a2e6744c9fd43bcb83c4706:/src/main.rs?ds=inline

diff --git a/src/main.rs b/src/main.rs
index 2f4b705..9b7132d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,18 +1,13 @@
 // Welcome to Rust-101
 // ===================
 // 
-// This is [Rust-101](https://www.ralfj.de/projects/rust-101/), a small *work-in-progress*
-// tutorial for the [Rust language](http://www.rust-lang.org/).
-// It is intended to be an interactive, hands-on course: I believe the only way to
-// *really* learn a language is to write code in it, so you should be coding during
-// the course. I am writing this with a tutorial situation in mind, i.e.,
-// with a teacher being around to guide students through the course and answer
-// questions as they come up. However, I think they may also be useful if you
-// work through them on your own, you will just have to show more initiative yourself:
-// Make sure you actually type some code. It may sound stupid to manually copy code
-// that you could duplicate through the clipboard, but it's actually helpful.
-// If you have questions, check out the "Additional Resources" below. In particular,
-// the IRC channel is filled with awesome people willing to help you! I spent
+// This is [Rust-101](https://www.ralfj.de/projects/rust-101/), a small tutorial for
+// the [Rust language](https://www.rust-lang.org/). It is intended to be an interactive,
+// hands-on course: I believe the only way to *really* learn a language is to write code
+// in it, so you should be coding during the course.
+// 
+// If you have any questions that are not answered here, check out the "Additional Resources"
+// below. In particular, the IRC channel is filled with awesome people willing to help you! I spent
 // lots of time there ;-)
 // 
 // I will assume some familiarity with programming, and hence not explain the basic
@@ -22,61 +17,72 @@
 // ---------
 // 
 // When you got here, I am kind of assuming that you already decided to give Rust at
-// least a look, so that I don't have to do much convincing here ;-) . But just in
+// least a look, so that I don't have to do much convincing here. But just in
 // case, here's why I think Rust is worth learning:<br/>
 // At this time, Rust is a language with a pretty unique set of goals. Rust aims to
 // achieve C++-style control over memory and execution behavior (like, static vs. dynamic
 // 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
-// first requirement rules out a garbage collector: Rust can run "mare 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.
+// safety (as in, the program will not crash in uncontrolled ways). The vast majority of existing
+// languages sacrifices control for safety (for example, by enforcing the usage of
+// a garbage collector) or vice versa. Rust can run without dynamic allocation (i.e., without
+// a heap), and even without an operating system. In fact, Rust rules out more classes of bugs
+// than languages that achieve safety with a garbage collector: Besides dangling pointers and
+// double-free, Rust also prevents issues such as iterator invalidation and data races. Finally,
+// it cleans up behind you, and deallocates resources (memory, but also file descriptors and really
+// anything) when you don't need them anymore.
 // 
 // 
 // Getting started
 // ---------------
 // 
 // You will need to have Rust installed, of course. It is available for download on
-// [the Rust website](http://www.rust-lang.org/). You should go for either the "stable"
-// or the "beta" channel. More detailed installation instructions are provided in
+// [the Rust website](https://www.rust-lang.org/). Make sure you get at least version 1.2.
+// More detailed installation instructions are provided in
 // [the second chapter of The Book](https://doc.rust-lang.org/stable/book/installing-rust.html).
-
-// 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)).
-// To generate your workspace, run `make workspace` (this needs GNU sed). I suggest you now copy the
-// `workspace` 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.)
+// 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](https://www.ralfj.de/git/rust-101.git)
+// (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).
 // 
-// If you later want to update the course, do `git pull` followed by `make workspace`. Then copy the files
-// from `workspace/src/` to your workspace that you did not yet work on. (Of course you can also copy the rest,
-// but that would replace all your hard work by the original files with all the holes!)
+// There is a workspace prepared for you in the `workspace` folder. I suggest you copy this
+// folder somewhere else. 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.)
 
 // Course Content
 // --------------
 // 
-// The part 00-03 cover some basic of the language, to give you a feeling for Rust's syntax and pervasive
-// mechanisms like pattern matching and traits. Parts 04-06 introduce the heart of the language, the ideas
-// making it different from anything else out there: Ownership, borrowing, lifetimes. In part 07-??, we
-// continue our tour through Rust with another example. Finally, in parts ??-??, we implement our own
-// version of `grep`, exhibiting useful Rust features as we go.
-// 
-// Now, open `your-workspace/src/part00.rs` in your favorite editor, and follow the link below for
-// the explanations and exercises. Have fun!
+// Open `your-workspace/src/part00.rs` in your favorite editor, and follow the link below for
+// the explanations and exercises. You are ready to start. Have fun!
 // 
+// ### Introduction
+//
 // * [Part 00: Algebraic datatypes](part00.html)
 // * [Part 01: Expressions, Inherent methods](part01.html)
 // * [Part 02: Generic types, Traits](part02.html)
 // * [Part 03: Input](part03.html)
-// * [Part 04: Ownership, Borrowing](part04.html)
+// 
+// ### Basic Rust
+// 
+// * [Part 04: Ownership, Borrowing, References](part04.html)
 // * [Part 05: Clone](part05.html)
 // * [Part 06: Copy, Lifetimes](part06.html)
 // * [Part 07: Operator Overloading, Tests, Formating](part07.html)
-// * (to be continued)
-#![allow(dead_code, unused_imports, unused_variables, unused_mut)]
+// * [Part 08: Associated Types, Modules](part08.html)
+// * [Part 09: Iterators](part09.html)
+// * [Part 10: Closures](part10.html)
+// 
+// ### Advanced Rust
+// 
+// * [Part 11: Trait Objects, Box, Lifetime bounds](part11.html)
+// * [Part 12: Rc, Interior Mutability, Cell, RefCell](part12.html)
+// * [Part 13: Concurrency, Arc, Send](part13.html)
+// * [Part 14: Slices, Arrays, External Dependencies](part14.html)
+// * [Part 15: Mutex, Interior Mutability (cont.), RwLock, Sync](part15.html)
+// * [Part 16: Unsafe Rust, Drop](part16.html)
+// 
+#![allow(dead_code, unused_imports, unused_variables, unused_mut, unreachable_code)]
 mod part00;
 mod part01;
 mod part02;
@@ -87,14 +93,21 @@ mod part06;
 mod part07;
 mod part08;
 mod part09;
+mod part10;
+mod part11;
+mod part12;
+mod part13;
+mod part14;
+mod part15;
+mod part16;
 
 // 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
 // -------------------
 // 
@@ -102,6 +115,8 @@ fn main() {
 // of the most interesting places here:
 // 
 // * [The Rust Book](https://doc.rust-lang.org/stable/book/)
+// * [The Rustonomicon](https://doc.rust-lang.org/nightly/nomicon/)
 // * [Rust by Example](http://rustbyexample.com/)
 // * The [Rust Subreddit](https://www.reddit.com/r/rust/)
-// * For the IRC channel and other forums, see the "Community" section of the [Rust Documentation index](http://doc.rust-lang.org/index.html)
+// * A [collection of links](https://github.com/ctjhoa/rust-learning) to blog posts, articles, videos, etc. for learning Rust.
+// * For the IRC channel and other forums, see the "Community" section of the [Rust Documentation index](https://doc.rust-lang.org/index.html)