typo; emphasis

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

diff --git a/src/main.rs b/src/main.rs
index 08a5d25f7bdabf18fc4150a8b7ef00dbacc07571..c20a47d07775f45fc7f9cd95287da4f2bdd80eeb 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,36 +23,30 @@
 // 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
 // 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 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 data races.
+// 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.

 // 
 // 
 // Getting started
 // ---------------
 // 
 // You will need to have Rust installed, of course. It is available for download on
 // 
 // 
 // 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/). Make sure you get at least version 1.2
-// (at the time of writing, that's the current beta release). More detailed installation
-// instructions are provided in [the second chapter of The Book](https://doc.rust-lang.org/stable/book/installing-rust.html).
+// [the Rust website](http://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).

 // This will also install `cargo`, the tool responsible for building rust projects (or *crates*).
 // 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 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
 // 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 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.
+// 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.)
 // (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 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
 // --------------
 
 // Course Content
 // --------------


@@ -119,6 +113,8 @@ fn main() {
 // of the most interesting places here:
 // 
 // * [The Rust Book](https://doc.rust-lang.org/stable/book/)
 // 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/)
 // * [Rust by Example](http://rustbyexample.com/)
 // * The [Rust Subreddit](https://www.reddit.com/r/rust/)

+// * 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](http://doc.rust-lang.org/index.html)
 // * For the IRC channel and other forums, see the "Community" section of the [Rust Documentation index](http://doc.rust-lang.org/index.html)