---

yaml
---
r: 234256
b: refs/heads/beta
c: a8a8dfb
h: refs/heads/master
v: v3

Author: christopherdumas

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 1eb726217d3a8ff8849594e88df068c4a13fbdc9
+refs/heads/beta: a8a8dfbe1a0aa917fb392bb8f3c037ef6a1ef27f
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_typeck/diagnostics.rs

@@ -1535,8 +1535,8 @@ For information on the design of the orphan rules, see [RFC 1023].
 
 E0118: r##"
 Rust can't find a base type for an implementation you are providing, or the type
-cannot have an implementation. For example, a typedef can't have an implementation,
-since it isn't its own type (this was done in PR #6087):
+cannot have an implementation. For example, a typedef can't have an
+implementation, since it isn't its own type (this was done in PR #6087):
 
 ```
 type NineString = [char, ..9]