---

yaml
---
r: 272892
b: refs/heads/beta
c: 6aa3d0f
h: refs/heads/master

Author: GuillaumeGomez

[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: 150ac067afb8da9d073628d0329b9d4348653fb5
+refs/heads/beta: 6aa3d0f11a26ff69b4675f780f66010c46169e38
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/lang_items.rs

@@ -185,19 +185,19 @@ impl<'a, 'tcx> LanguageItemCollector<'a, 'tcx> {
         match self.items.items[item_index] {
             Some(original_def_id) if original_def_id != item_def_id => {
                 let cstore = &self.session.cstore;
-                let span = self.ast_map.span_if_local(original_def_id).unwrap_or(span);
+                let span = self.ast_map.span_if_local(item_def_id).unwrap_or(span);
                 let mut err = struct_span_err!(self.session,
                                                 span,
                                                 E0152,
                                                 "Duplicate lang item found: `{}`.",
                                                 LanguageItems::item_name(item_index));
-                if let Some(span) = self.ast_map.span_if_local(item_def_id) {
+                if let Some(span) = self.ast_map.span_if_local(original_def_id) {
                     span_note!(&mut err, span,
                                "First defined here.");
                 } else {
                     span_note!(&mut err, span,
                                "First defined in crate `{}`.",
-                               cstore.crate_name(item_def_id.krate));
+                               cstore.crate_name(original_def_id.krate));
                 }
                 err.emit();
             }
@@ -225,8 +225,8 @@ impl<'a, 'tcx> LanguageItemCollector<'a, 'tcx> {
     }
 
     pub fn collect(&mut self, krate: &hir::Crate) {
-        self.collect_local_language_items(krate);
         self.collect_external_language_items(krate);
+        self.collect_local_language_items(krate);
     }
 }