---

yaml
---
r: 234602
b: refs/heads/tmp
c: a8a8dfb
h: refs/heads/master
v: v3

Author: christopherdumas

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 1eb726217d3a8ff8849594e88df068c4a13fbdc9
+refs/heads/tmp: a8a8dfbe1a0aa917fb392bb8f3c037ef6a1ef27f
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/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]