---

yaml
---
r: 221541
b: refs/heads/snap-stage3
c: e9c1530
h: refs/heads/master
i:
  221539: bfc7600
v: v3

Author: Manishearth

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 607f74df2ad6b6fb32ce5b862a9e48a8c4afdad2
-refs/heads/snap-stage3: 29d7147dda7f7fbca1341a7cad2f67107db49863
+refs/heads/snap-stage3: e9c15307a97a4389d12a29ec8d0d42171710d71f
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/src/librustc/diagnostics.rs

@@ -803,6 +803,12 @@ fn main() {
 See also https://doc.rust-lang.org/book/unsafe.html
 "##,
 
+// This shouldn't really ever trigger since the repeated value error comes first
+E0136: r##"
+A binary can only have one entry point, and by default that entry point is the
+function `main()`. If there are multiple such functions, please rename one.
+"##,
+
 E0137: r##"
 This error indicates that the compiler found multiple functions with the
 `#[main]` attribute. This is an error because there must be a unique entry
@@ -1596,7 +1602,6 @@ register_diagnostics! {
     // E0006 // merged with E0005
 //  E0134,
 //  E0135,
-    E0136,
     E0138,
     E0139,
     E0264, // unknown external lang item