---

yaml
---
r: 235462
b: refs/heads/stable
c: 60133aa
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 31262c206e9d0152610572859092132555c7d492
+refs/heads/stable: 60133aa6dd4bf288cacbaba72368f80c131d252c
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_resolve/build_reduced_graph.rs

@@ -26,6 +26,7 @@ use ParentLink::{self, ModuleParentLink, BlockParentLink};
 use Resolver;
 use resolve_imports::Shadowable;
 use TypeNsDef;
+use {resolve_error, ResolutionError};
 
 use self::DuplicateCheckingMode::*;
 use self::NamespaceError::*;
@@ -208,12 +209,12 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
                     // Return an error here by looking up the namespace that
                     // had the duplicate.
                     let ns = ns.unwrap();
-                    ::resolve_error(
+                    resolve_error(
                         self,
                         sp,
-                        &::ResolutionError::DuplicateDefinition(
+                        ResolutionError::DuplicateDefinition(
                             namespace_error_to_string(duplicate_type),
-                            &*token::get_name(name))
+                            name)
                     );
                     {
                         let r = child.span_for_namespace(ns);
@@ -307,9 +308,9 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
                             full_path.segments.last().unwrap().identifier.name;
                         if &token::get_name(source_name)[..] == "mod" ||
                            &token::get_name(source_name)[..] == "self" {
-                            ::resolve_error(self,
+                            resolve_error(self,
                                             view_path.span,
-                                            &::ResolutionError::SelfImportsOnlyAllowedWithin
+                                            ResolutionError::SelfImportsOnlyAllowedWithin
                             );
                         }
 
@@ -330,10 +331,10 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
                             _ => None
                         }).collect::<Vec<Span>>();
                         if mod_spans.len() > 1 {
-                            ::resolve_error(
+                            resolve_error(
                                 self,
                                 mod_spans[0],
-                                &::ResolutionError::SelfImportCanOnlyAppearOnceInTheList
+                                ResolutionError::SelfImportCanOnlyAppearOnceInTheList
                             );
                             for other_span in mod_spans.iter().skip(1) {
                                 self.session.span_note(*other_span,
@@ -349,10 +350,10 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
                                     let name = match module_path.last() {
                                         Some(name) => *name,
                                         None => {
-                                            ::resolve_error(
+                                            resolve_error(
                                                 self,
                                                 source_item.span,
-                                                &::ResolutionError::
+                                                ResolutionError::
                                                 SelfImportOnlyInImportListWithNonEmptyPrefix
                                             );
                                             continue;