gitignore hidden files in the workspace

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

diff --git a/src/main.rs b/src/main.rs
index 4ecf632498c9cb1208ad451b1df948c8424a6217..cf0cd8773b79bf9a07c40ad6e7e474399111d99d 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,7 @@
 // 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
 // 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
 // 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


@@ -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)
 // 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.)
 // 
 // 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
 // copy the rest, but that would replace all your hard work by the original files with all the holes!)
 
 // Course Content