projects
/
rust-101.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a115b75
)
*oops* typos
author
Ralf Jung
<post@ralfj.de>
Fri, 26 Jun 2015 18:00:38 +0000
(20:00 +0200)
committer
Ralf Jung
<post@ralfj.de>
Fri, 26 Jun 2015 18:00:38 +0000
(20:00 +0200)
src/main.rs
patch
|
blob
|
history
diff --git
a/src/main.rs
b/src/main.rs
index 4ecf632498c9cb1208ad451b1df948c8424a6217..70ba7967b4ea2c227fa40da979c8debcde02d8ab 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 sacrific
i
es 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,13
+42,15
@@
// 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
t
ip archive).
+// If you later want to update the course, do `git pull` (or re-download the
z
ip archive).
// 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!)
// 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!)