---

yaml
---
r: 228731
b: refs/heads/try
c: 3080df3
h: refs/heads/master
i:
  228729: 561ff0d
  228727: 3bb66bb
v: v3

Author: Manishearth

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: e9c15307a97a4389d12a29ec8d0d42171710d71f
+refs/heads/try: 3080df36e27ed74399f9fe22e4796e209abd2b69
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc/diagnostics.rs

@@ -815,6 +815,12 @@ This error indicates that the compiler found multiple functions with the
 point into a Rust program.
 "##,
 
+E0138: r##"
+This error indicates that the compiler found multiple functions with the
+`#[start]` attribute. This is an error because there must be a unique entry
+point into a Rust program.
+"##,
+
 E0152: r##"
 Lang items are already implemented in the standard library. Unless you are
 writing a free-standing application (e.g. a kernel), you do not need to provide
@@ -1602,7 +1608,6 @@ register_diagnostics! {
     // E0006 // merged with E0005
 //  E0134,
 //  E0135,
-    E0138,
     E0139,
     E0264, // unknown external lang item
     E0269, // not all control paths return a value