Rebase cleanup

Author: sfackler

src/librustc/metadata/csearch.rs

@@ -117,7 +117,7 @@ pub fn maybe_get_item_ast<'tcx>(tcx: &ty::ctxt<'tcx>, def: ast::DefId,
 }
 
 pub fn get_enum_variant_defs(cstore: &cstore::CStore, enum_id: ast::DefId)
-                             -> Vec<(def::Def, ast::Ident, ast::Visibility)> {
+                             -> Vec<(def::Def, ast::Name, ast::Visibility)> {
     let cdata = cstore.get_crate_data(enum_id.krate);
     decoder::get_enum_variant_defs(&*cstore.intr, &*cdata, enum_id.node)
 }

src/librustc/metadata/decoder.rs

@@ -665,7 +665,7 @@ pub fn maybe_get_item_ast<'tcx>(cdata: Cmd, tcx: &ty::ctxt<'tcx>, id: ast::NodeI
 pub fn get_enum_variant_defs(intr: &IdentInterner,
                              cdata: Cmd,
                              id: ast::NodeId)
-                             -> Vec<(def::Def, ast::Ident, ast::Visibility)> {
+                             -> Vec<(def::Def, ast::Name, ast::Visibility)> {
     let data = cdata.data();
     let items = reader::get_doc(rbml::Doc::new(data), tag_items);
     let item = find_item(id, items);

src/librustc/middle/resolve.rs

@@ -1301,7 +1301,7 @@ impl<'a> Resolver<'a> {
                 name_bindings.define_type
                     (DefTy(local_def(item.id), true), sp, modifiers);
 
-                let parent_link = self.get_parent_link(parent.clone(), ident);
+                let parent_link = self.get_parent_link(parent.clone(), name);
                 // We want to make sure the module type is EnumModuleKind
                 // even if there's already an ImplModuleKind module defined,
                 // since that's how we prevent duplicate enum definitions
@@ -2720,7 +2720,7 @@ impl<'a> Resolver<'a> {
                 self.check_that_import_is_importable(
                     &**name_bindings,
                     directive.span,
-                    target.name,
+                    target,
                     ValueNS);
 
                 import_resolution.value_target =
@@ -2749,7 +2749,7 @@ impl<'a> Resolver<'a> {
                 self.check_that_import_is_importable(
                     &**name_bindings,
                     directive.span,
-                    target.name,
+                    target,
                     TypeNS);
 
                 import_resolution.type_target =