---

yaml
---
r: 234254
b: refs/heads/beta
c: 5fa6095
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: a85bc05280b3e5e08d971cfa61458e8c4ee7d950
+refs/heads/beta: 5fa6095f2cc17a8476fa7b0e898a99fb6e3861ef
 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

@@ -1551,7 +1551,7 @@ impelementation for:
 ```
 impl SomeTypeThatDoesntExist {  }
 ```
-"##
+"##,
 
 E0119: r##"
 There are conflicting trait implementations for the same type.
@@ -3214,7 +3214,7 @@ register_diagnostics! {
     E0090,
     E0103, // @GuillaumeGomez: I was unable to get this error, try your best!
     E0104,
-//  E0118,
+    E0118,
 //  E0123,
 //  E0127,
 //  E0129,