From 915cf01cb62260b499ee991efe9f25f849692115 Mon Sep 17 00:00:00 2001 From: Chris C Cerami Date: Sun, 4 Oct 2015 22:48:07 -0400 Subject: [PATCH 1/3] Use a more common word than "elide", e.g. omit --- src/doc/trpl/lifetimes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/trpl/lifetimes.md b/src/doc/trpl/lifetimes.md index fb2fc83e062..cd4ef6d04d6 100644 --- a/src/doc/trpl/lifetimes.md +++ b/src/doc/trpl/lifetimes.md @@ -70,7 +70,7 @@ fn bar<'a>(x: &'a i32) { ``` The `'a` reads ‘the lifetime a’. Technically, every reference has some lifetime -associated with it, but the compiler lets you elide them in common cases. +associated with it, but the compiler lets you omit them in common cases. Before we get to that, though, let’s break the explicit example down: ```rust,ignore From e39808cba87392c6a95243844698c4b368853a36 Mon Sep 17 00:00:00 2001 From: Chris C Cerami Date: Mon, 5 Oct 2015 11:40:32 -0400 Subject: [PATCH 2/3] Link to 'Lifetime Elision' section at first use of elide --- src/doc/trpl/lifetimes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/doc/trpl/lifetimes.md b/src/doc/trpl/lifetimes.md index cd4ef6d04d6..eb61dfbd121 100644 --- a/src/doc/trpl/lifetimes.md +++ b/src/doc/trpl/lifetimes.md @@ -70,9 +70,11 @@ fn bar<'a>(x: &'a i32) { ``` The `'a` reads ‘the lifetime a’. Technically, every reference has some lifetime -associated with it, but the compiler lets you omit them in common cases. +associated with it, but the compiler lets you elide (i.e. omit, see ["Lifetime Elision"][lifetime-elision] below) them in common cases. Before we get to that, though, let’s break the explicit example down: +[lifetime-elision]: #user-content-lifetime-elision + ```rust,ignore fn bar<'a>(...) ``` From f490f5171e3557af3264c0aa5dbb4bb49e3c72b3 Mon Sep 17 00:00:00 2001 From: Chris C Cerami Date: Tue, 6 Oct 2015 10:39:37 -0400 Subject: [PATCH 3/3] Wrap words at 80 characters --- src/doc/trpl/lifetimes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/doc/trpl/lifetimes.md b/src/doc/trpl/lifetimes.md index eb61dfbd121..4896be714bb 100644 --- a/src/doc/trpl/lifetimes.md +++ b/src/doc/trpl/lifetimes.md @@ -70,7 +70,8 @@ fn bar<'a>(x: &'a i32) { ``` The `'a` reads ‘the lifetime a’. Technically, every reference has some lifetime -associated with it, but the compiler lets you elide (i.e. omit, see ["Lifetime Elision"][lifetime-elision] below) them in common cases. +associated with it, but the compiler lets you elide (i.e. omit, see +["Lifetime Elision"][lifetime-elision] below) them in common cases. Before we get to that, though, let’s break the explicit example down: [lifetime-elision]: #user-content-lifetime-elision