From 46c141eefadadaf82b1414ae19d3766bbd4ba0cc Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 18 Jun 2015 13:31:32 +0200 Subject: [PATCH] document intended usage of 'workspace' --- src/main.rs | 24 ++++++++++++++---------- workspace/src/main.rs | 3 ++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main.rs b/src/main.rs index 31537df..9d6e878 100644 --- a/src/main.rs +++ b/src/main.rs @@ -36,23 +36,27 @@ // 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). -// 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 // -------------- @@ -64,7 +68,7 @@ // 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: Algebraic datatypes](part00.html) // * [Part 01: Expressions, Inherent methods](part01.html) diff --git a/workspace/src/main.rs b/workspace/src/main.rs index bcf8785..771cd19 100644 --- a/workspace/src/main.rs +++ b/workspace/src/main.rs @@ -1,9 +1,10 @@ mod part00; mod part01; mod part02; +mod part04; #[cfg(not(test))] /* If you get warnings about functions not being used on "crate test", adding this attribute will fix them. It says that the function is only to be compiled if we are *not* compiling for tests. */ fn main() { - part00::part_main(); + part00::main(); } -- 2.30.2