5 files changed, 8 insertions, 1 deletions
diff --git a/src/librustc_data_structures/Cargo.toml b/src/librustc_data_structures/Cargo.toml
index ae3403cf0ce..e020f2f8da9 100644
--- a/src/librustc_data_structures/Cargo.toml
+++ b/src/librustc_data_structures/Cargo.toml
@@ -24,6 +24,7 @@ rayon = { version = "0.2.0", package = "rustc-rayon" }
 rayon-core = { version = "0.2.0", package = "rustc-rayon-core" }
 rustc-hash = "1.0.1"
 smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
+rustc_index = { path = "../librustc_index", package = "rustc_index" }
 
 [dependencies.parking_lot]
 version = "0.9"
diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs
index d6e9c479c9b..a9ef297fa99 100644
--- a/src/librustc_data_structures/lib.rs
+++ b/src/librustc_data_structures/lib.rs
@@ -37,6 +37,7 @@ extern crate libc;
 extern crate cfg_if;
 
 pub use rustc_serialize::hex::ToHex;
+pub use rustc_index::{indexed_vec, newtype_index};
 
 #[inline(never)]
 #[cold]
@@ -75,7 +76,6 @@ pub mod flock;
 pub mod fx;
 pub mod stable_map;
 pub mod graph;
-pub mod indexed_vec;
 pub mod jobserver;
 pub mod obligation_forest;
 pub mod owning_ref;
diff --git a/src/librustc_index/Cargo.toml b/src/librustc_index/Cargo.toml
index f3d837c73b8..10e66ffe590 100644
--- a/src/librustc_index/Cargo.toml
+++ b/src/librustc_index/Cargo.toml
@@ -10,3 +10,4 @@ path = "lib.rs"
 doctest = false
 
 [dependencies]
+rustc_serialize = { path = "../libserialize", package = "serialize" }
diff --git a/src/librustc_data_structures/indexed_vec.rs b/src/librustc_index/indexed_vec.rs
index 6e80b48a685..6e80b48a685 100644
--- a/src/librustc_data_structures/indexed_vec.rs
+++ b/src/librustc_index/indexed_vec.rs
diff --git a/src/librustc_index/lib.rs b/src/librustc_index/lib.rs
new file mode 100644
index 00000000000..c4c4948e7bf
--- /dev/null
+++ b/src/librustc_index/lib.rs
@@ -0,0 +1,5 @@
+#![feature(allow_internal_unstable)]
+#![feature(unboxed_closures)]
+#![feature(fn_traits)]
+
+pub mod indexed_vec;