From: Ralf Jung Date: Sun, 31 Mar 2019 14:30:13 +0000 (+0200) Subject: Merge pull request #33 from louy2/patch-3 X-Git-Url: https://git.ralfj.de/rust-101.git/commitdiff_plain/fae4918e595dcdac5346a922c2f08debc8de06df?hp=6061ecdc4d3d73c3b833c0505bb7ddfd12e87802 Merge pull request #33 from louy2/patch-3 Add exercise 10.2 (#24) --- diff --git a/README.md b/README.md index e7068ac..be0e4fb 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The most accessible form of the tutorial is its You can either read through the sources in `src/`, or generate the HTML in `docs/` using `make docs` (this step needs -[Pycco](https://fitzgen.github.io/pycco/)). +[Pycco](https://pycco-docs.github.io/pycco/)). The files `workspace/src/part*.rs` are generated by `make workspace`. diff --git a/src/part06.rs b/src/part06.rs index 21fe644..939fe08 100644 --- a/src/part06.rs +++ b/src/part06.rs @@ -162,7 +162,7 @@ fn rust_foo(mut v: Vec) -> i32 { //@ application code. Most of the time, we don't have to explicitly add lifetimes to function //@ types. This is thanks to *lifetime elision*, where Rust will automatically insert lifetimes we //@ did not specify, following some simple, well-documented -//@ [rules](https://doc.rust- lang.org/stable/book/lifetimes.html#lifetime-elision). +//@ [rules](https://doc.rust-lang.org/stable/book/lifetimes.html#lifetime-elision). //@ [index](main.html) | [previous](part05.html) | [raw source](workspace/src/part06.rs) | //@ [next](part07.html)