Auto merge of #27576 - rust-lang:steveklabnik-patch-1, r=Gankro

bors · bors · commit 9bba7110639c · 2015-08-07T05:57:24.000Z
1. this isn't actually true about diabetes 2. people with diabetes will get *real sad* when reading this 3. it isn't actually necessary. r? @gankro
diff --git a/src/doc/nomicon/lifetimes.md b/src/doc/nomicon/lifetimes.md
@@ -52,8 +52,7 @@ likely desugar to the following:
 }
 ```
 
-Wow. That's... awful. Let's all take a moment to thank Rust for being a
-diabetes-inducing torrent of syrupy-goodness.
+Wow. That's... awful. Let's all take a moment to thank Rust for making this easier.
 
 Actually passing references to outer scopes will cause Rust to infer
 a larger lifetime:

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ likely desugar to the following:`
`52`	`52`	`}`
`53`	`53`	```
`54`	`54`
`55`		`-Wow. That's... awful. Let's all take a moment to thank Rust for being a`
`56`		`-diabetes-inducing torrent of syrupy-goodness.`
	`55`	`+Wow. That's... awful. Let's all take a moment to thank Rust for making this easier.`
`57`	`56`
`58`	`57`	`Actually passing references to outer scopes will cause Rust to infer`
`59`	`58`	`a larger lifetime:`