Switch baack to Spanned<Name> instead of Ident

While the fields are equivalent, we we constructing `Ident`s for things
that weren't really identifiers (e.g `kw::Invalid` + the span of one of
the types in a tuple struct).

Author: Aaron1011

src/librustc_metadata/rmeta/decoder.rs

@@ -35,7 +35,7 @@ use std::u32;
 
 use log::debug;
 use proc_macro::bridge::client::ProcMacro;
-use rustc_ast::ast::{self, Ident};
+use rustc_ast::ast::{self, Ident, Name};
 use rustc_attr as attr;
 use rustc_expand::base::{SyntaxExtension, SyntaxExtensionKind};
 use rustc_expand::proc_macro::{AttrProcMacro, BangProcMacro, ProcMacroDerive};
@@ -47,6 +47,7 @@ use rustc_span::{self, hygiene::MacroKind, BytePos, Pos, Span, DUMMY_SP};
 use crate::creader::{ImportedSourceFile, SourceMapImportInfo};
 
 pub use cstore_impl::{provide, provide_extern};
+use rustc_span::source_map::{respan, Spanned};
 
 mod cstore_impl;
 
@@ -1314,14 +1315,17 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
         )
     }
 
-    fn get_struct_field_names(&self, id: DefIndex, sess: &Session) -> Vec<Ident> {
+    fn get_struct_field_names(&self, id: DefIndex, sess: &Session) -> Vec<Spanned<Name>> {
         self.root
             .per_def
             .children
             .get(self, id)
             .unwrap_or(Lazy::empty())
             .decode((self, sess))
-            .map(|index| self.item_name(index))
+            .map(|index| {
+                let ident = self.item_name(index);
+                respan(ident.span, ident.name)
+            })
             .collect()
     }
 

src/librustc_metadata/rmeta/decoder/cstore_impl.rs

@@ -20,9 +20,10 @@ use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_data_structures::svh::Svh;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, CRATE_DEF_INDEX, LOCAL_CRATE};
-use rustc_span::source_map::{self, Span};
-use rustc_span::symbol::{Ident, Symbol};
+use rustc_span::source_map::{self, Span, Spanned};
+use rustc_span::symbol::Symbol;
 
+use rustc_ast::ast::Name;
 use rustc_data_structures::sync::Lrc;
 use smallvec::SmallVec;
 use std::any::Any;
@@ -386,7 +387,7 @@ pub fn provide(providers: &mut Providers<'_>) {
 }
 
 impl CStore {
-    pub fn struct_field_names_untracked(&self, def: DefId, sess: &Session) -> Vec<Ident> {
+    pub fn struct_field_names_untracked(&self, def: DefId, sess: &Session) -> Vec<Spanned<Name>> {
         self.get_crate_data(def.krate).get_struct_field_names(def.index, sess)
     }
 

src/librustc_resolve/build_reduced_graph.rs

@@ -19,9 +19,9 @@ use rustc::bug;
 use rustc::hir::exports::Export;
 use rustc::middle::cstore::CrateStore;
 use rustc::ty;
-use rustc_ast::ast::Ident;
 use rustc_ast::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind, NodeId};
 use rustc_ast::ast::{AssocItem, AssocItemKind, MetaItemKind, StmtKind};
+use rustc_ast::ast::{Ident, Name};
 use rustc_ast::token::{self, Token};
 use rustc_ast::visit::{self, AssocCtxt, Visitor};
 use rustc_attr as attr;
@@ -37,6 +37,7 @@ use rustc_span::symbol::{kw, sym};
 use rustc_span::{Span, DUMMY_SP};
 
 use log::debug;
+use rustc_span::source_map::{respan, Spanned};
 use std::cell::Cell;
 use std::ptr;
 
@@ -287,12 +288,18 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
         let field_names = vdata
             .fields()
             .iter()
-            .map(|field| field.ident.unwrap_or_else(|| Ident::new(kw::Invalid, field.span)))
+            .map(|field| {
+                field
+                    .ident
+                    // For unnamed fields, use the span of the field with `kw::Invalid`
+                    // For named fields, just convert the `Ident` to a `Spanned<Name>` directly
+                    .map_or_else(|| respan(field.span, kw::Invalid), |i| respan(i.span, i.name))
+            })
             .collect();
         self.insert_field_names(def_id, field_names);
     }
 
-    fn insert_field_names(&mut self, def_id: DefId, field_names: Vec<Ident>) {
+    fn insert_field_names(&mut self, def_id: DefId, field_names: Vec<Spanned<Name>>) {
         if !field_names.is_empty() {
             self.r.field_names.insert(def_id, field_names);
         }

src/librustc_resolve/late/diagnostics.rs

@@ -624,7 +624,7 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
                             if let Some(field_names) = self.r.field_names.get(&did) {
                                 if field_names
                                     .iter()
-                                    .any(|&field_name| ident.name == field_name.name)
+                                    .any(|&field_name| ident.name == field_name.node)
                                 {
                                     return Some(AssocSuggestion::Field);
                                 }

src/librustc_resolve/lib.rs

@@ -58,6 +58,7 @@ use diagnostics::{ImportSuggestion, Suggestion};
 use imports::{Import, ImportKind, ImportResolver, NameResolution};
 use late::{HasGenericParams, PathSource, Rib, RibKind::*};
 use macros::{MacroRulesBinding, MacroRulesScope};
+use rustc_span::source_map::Spanned;
 
 type Res = def::Res<NodeId>;
 
@@ -834,7 +835,7 @@ pub struct Resolver<'a> {
 
     /// Names of fields of an item `DefId` accessible with dot syntax.
     /// Used for hints during error reporting.
-    field_names: FxHashMap<DefId, Vec<Ident>>,
+    field_names: FxHashMap<DefId, Vec<Spanned<Name>>>,
 
     /// All imports known to succeed or fail.
     determined_imports: Vec<&'a Import<'a>>,