Auto merge of #68170 - wesleywiser:stop_const_prop_ref_taking, r=oli-obk

[rust.git] / src / librustc_resolve / def_collector.rs

diff --git a/src/librustc_resolve/def_collector.rs b/src/librustc_resolve/def_collector.rs
index 2e3eb12d91713e203dc90414a1bc6e560c70e97e..696ba0e994c7dbd095481e2c47cdd8c60befc9a1 100644 (file)
--- a/src/librustc_resolve/def_collector.rs
+++ b/src/librustc_resolve/def_collector.rs
@@ -1,13 +1,13 @@
 use log::debug;
-use rustc::hir::def_id::DefIndex;
 use rustc::hir::map::definitions::*;
+use rustc_expand::expand::AstFragment;
+use rustc_hir::def_id::DefIndex;
+use rustc_span::hygiene::ExpnId;
+use rustc_span::symbol::{kw, sym};
+use rustc_span::Span;
 use syntax::ast::*;
-use syntax::symbol::{kw, sym};
 use syntax::token::{self, Token};
 use syntax::visit;
-use syntax_expand::expand::AstFragment;
-use syntax_pos::hygiene::ExpnId;
-use syntax_pos::Span;
 
 crate fn collect_definitions(
     definitions: &mut Definitions,
@@ -104,7 +104,7 @@ fn visit_item(&mut self, i: &'a Item) {
         // Pick the def data. This need not be unique, but the more
         // information we encapsulate into, the better
         let def_data = match &i.kind {
-            ItemKind::Impl(..) => DefPathData::Impl,
+            ItemKind::Impl { .. } => DefPathData::Impl,
             ItemKind::Mod(..) if i.ident.name == kw::Invalid => {
                 return visit::walk_item(self, i);
             }