---

yaml
---
r: 221069
b: refs/heads/tmp
c: 91f0301
h: refs/heads/master
i:
  221067: a3ad633
v: v3

Author: AlisdairO

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: c8bab9d06a179028a0d5129aa62f09d694d9cc49
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: f78333e052d0aee0387695de9e115f34802fd928
+refs/heads/tmp: 91f0301aa521e057ab180d8d0c6b2ca98796f095
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: e58601ab085591c71a27ae82137fc313222c2270
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/librustc_typeck/diagnostics.rs

@@ -2139,9 +2139,9 @@ enum Foo<T> {
 }
 ```
 
-This error may also commonly be found when working with unsafe code.  For
+This error may also commonly be found when working with unsafe code. For
 example, when using raw pointers one may wish to specify the lifetime for
-which the pointed-at data is valid.  An initial attempt (below) causes this
+which the pointed-at data is valid. An initial attempt (below) causes this
 error:
 
 ```
@@ -2151,8 +2151,8 @@ struct Foo<'a, T> {
 ```
 
 We want to express the constraint that Foo should not outlive `'a`, because
-the data pointed to by `T` is only valid for that lifetime.  The problem is
-that there are no actual uses of `'a`.  It's possible to work around this
+the data pointed to by `T` is only valid for that lifetime. The problem is
+that there are no actual uses of `'a`. It's possible to work around this
 by adding a PhantomData type to the struct, using it to tell the compiler
 to act as if the struct contained a borrowed reference `&'a T`:
 
@@ -2165,8 +2165,8 @@ struct Foo<'a, T: 'a> {
 }
 ```
 
-PhantomData can also be used to express information about unused type parameters.
-You can read more about it in the API documentation:
+PhantomData can also be used to express information about unused type
+parameters. You can read more about it in the API documentation:
 
 https://doc.rust-lang.org/std/marker/struct.PhantomData.html
 "##