Auto merge of #67831 - mati865:ci-images-upgrade, r=pietroalbini

[rust.git] / src / librustc_session / node_id.rs

diff --git a/src/librustc_session/node_id.rs b/src/librustc_session/node_id.rs
index 59e227895b508c2da481467b59728cda69cdfa54..9fefe908e578e3838b1cc2b90c276668a63c2efa 100644 (file)
--- a/src/librustc_session/node_id.rs
+++ b/src/librustc_session/node_id.rs
@@ -1,7 +1,6 @@
-use rustc_index::vec::Idx;
 use rustc_serialize::{Decoder, Encoder};
+use rustc_span::ExpnId;
 use std::fmt;
-use syntax_pos::ExpnId;
 
 rustc_index::newtype_index! {
     pub struct NodeId {
@@ -10,6 +9,8 @@ pub struct NodeId {
     }
 }
 
+rustc_data_structures::define_id_collections!(NodeMap, NodeSet, NodeId);
+
 impl NodeId {
     pub fn placeholder_from_expn_id(expn_id: ExpnId) -> Self {
         NodeId::from_u32(expn_id.as_u32())