Fix rebase fallout

rust-lang · Mar 17, 2020 · 766a1d3 · 766a1d3
1 parent f9a34e8
commit 766a1d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/librustc_resolve/def_collector.rs b/src/librustc_resolve/def_collector.rs
@@ -192,7 +192,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
     fn visit_assoc_item(&mut self, i: &'a AssocItem, ctxt: visit::AssocCtxt) {
         let def_data = match &i.kind {
             AssocItemKind::Fn(..) | AssocItemKind::Const(..) => DefPathData::ValueNs(i.ident),
-            AssocItemKind::TyAlias(..) => DefPathData::TypeNs(i.ident.name),
+            AssocItemKind::TyAlias(..) => DefPathData::TypeNs(i.ident),
             AssocItemKind::MacCall(..) => return self.visit_macro_invoc(i.id),
         };
 

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
@@ -45,7 +45,6 @@ use rustc_metadata::creader::{CStore, CrateLoader};
 use rustc_session::lint::{BuiltinLintDiagnostics, LintBuffer};
 use rustc_session::Session;
 use rustc_span::hygiene::{ExpnId, ExpnKind, MacroKind, SyntaxContext, Transparency};
-use rustc_span::source_map::Spanned;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{Span, DUMMY_SP};