---

yaml
---
r: 220871
b: refs/heads/auto
c: 91f0301
h: refs/heads/master
i:
  220869: 72263b0
  220867: dbe93e4
  220863: 181d813
v: v3

Author: AlisdairO

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: f78333e052d0aee0387695de9e115f34802fd928
+refs/heads/auto: 91f0301aa521e057ab180d8d0c6b2ca98796f095
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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
 "##