*oops* sync titles

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

diff --git a/src/main.rs b/src/main.rs
index 15b798c43ad564dadff7b9cba8b63221b6926fdb..80f766ebb9f22fdd320e830bef0002428964b312 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -36,39 +36,48 @@
 // such as iterator invalidation and race conditions.
 // 
 // 
 // such as iterator invalidation and race conditions.
 // 
 // 

-// Prerequisites
-// -------------
+// 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/). At this point, I plan to restrict
 // myself to stable Rust, so "Recommended" version is just right.
 // You can find some more installation instructions in
 // [the second chapter of The Book](https://doc.rust-lang.org/stable/book/installing-rust.html).
 // 
 // You will need to have Rust installed, of course. It is available for download on
 // [the Rust website](http://www.rust-lang.org/). At this point, I plan to restrict
 // myself to stable Rust, so "Recommended" version is just right.
 // You can find some more installation instructions in
 // [the second chapter of The Book](https://doc.rust-lang.org/stable/book/installing-rust.html).

-// When you are done, running `cargo build` in the root of Rust-101 should successfully compile
-// all the code.
+
+// 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)). Running `cargo build`
+// in the root of the repository should now succeed.

 // 
 // 

-// Getting the source
-// ------------------
+// I suggest you copy the folder `workspace` somewhere you like, so that you can still easily
+// `git pull` updates in the main repository. After copying, try `cargo build` in the
+// new location. It should complain about `part00::main()` not being found. Now you can start
+// by following [Part 00](part00.html), typing in `part00.rs`. If you need to add a new file, remember to also
+// add it to `main.rs` so that Rust finds it.

 // 
 // 

-// You are meant to play around with the source code of the course as you go on, so please
-// fetch it from the [git repository](http://www.ralfj.de/git/rust-101.git) (also available
-// [on GitHub](https://github.com/RalfJung/rust-101)).
+// If you do not want to copy all the code yourself, and wish to start with my code and just edit
+// it, you can copy the files from `src` in this repository, to `src` in your workspace copy.

 
 // Course Content
 // --------------
 // 
 // The actual course is in the partXX.rs files. 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.
 
 // Course Content
 // --------------
 // 
 // The actual course is in the partXX.rs files. 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-?? introduce the heart of the language, the mechanism making it different from anything
-// else out there.
+// Parts 04-06 introduce the heart of the language, the mechanism making it different from anything
+// else out there: Ownership, borrowing, lifetimes. In part 07-??, we continue our tour through
+// Rust. Finally, in parts ??-??, we implement our own version of `grep`, exhibiting useful Rust
+// features as we go.

 // 
 // 

-// I suggest you get started with [the first part](part00.html), or jump directly to where you left off:
+// You should start with [the first part](part00.html), or jump directly to where you left off:

 // 
 // 

-// * [Part 00](part00.html)
-// * [Part 01](part01.html)
-// * [Part 02](part02.html)
-// * [Part 03](part03.html)
-// * [Part 04](part04.html) (WIP)
+// * [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)
+// * [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)]
 mod part00;
 // * (to be continued)
 #![allow(dead_code, unused_imports, unused_variables, unused_mut)]
 mod part00;


@@ -79,12 +88,14 @@ mod part04;
 mod part05;
 mod part06;
 mod part07;
 mod part05;
 mod part06;
 mod part07;

+mod part08;
+mod part09;

 
 // To actually run the code of some part (after filling in the blanks, if necessary), simply edit the `main`
 // function.
 
 fn main() {
 
 // To actually run the code of some part (after filling in the blanks, if necessary), simply edit the `main`
 // function.
 
 fn main() {

-    part00::main();
+    part03::main();

 }
 
 // Additional material
 }
 
 // Additional material