about summary refs log tree commit diff
path: root/src/librustc_data_structures/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-01 21:14:35 +0000
committerbors <bors@rust-lang.org>2018-03-01 21:14:35 +0000
commitddfbf2b0f4726f11bc8e857274ae1a0f8343a73f (patch)
tree76f70a510dc79c8d3fca5d6c941dcc6a7bffb2be /src/librustc_data_structures/lib.rs
parent3eeb5a665e313c5b281820099e04d4c6c8188b46 (diff)
parentfec4d3b71161aa7b2861861cbf9b708c8c393b30 (diff)
Auto merge of #47861 - sgrif:sg-rebase-chalkify-universe-refactorings, r=nikomatsakis
Rebased refactorings for Chalk

The code is Niko's, I just handled the rebase.

r? @nikomatsakis
Diffstat (limited to 'src/librustc_data_structures/lib.rs')
-rw-r--r--src/librustc_data_structures/lib.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs
index 33d760d0a14..265c6485830 100644
--- a/src/librustc_data_structures/lib.rs
+++ b/src/librustc_data_structures/lib.rs
@@ -39,6 +39,7 @@
 #![cfg_attr(test, feature(test))]
 
 extern crate core;
+extern crate ena;
 #[macro_use]
 extern crate log;
 extern crate serialize as rustc_serialize; // used by deriving
@@ -63,10 +64,10 @@ pub mod indexed_vec;
 pub mod obligation_forest;
 pub mod sip128;
 pub mod snapshot_map;
-pub mod snapshot_vec;
+pub use ena::snapshot_vec;
 pub mod stable_hasher;
 pub mod transitive_relation;
-pub mod unify;
+pub use ena::unify;
 pub mod fx;
 pub mod tuple_slice;
 pub mod control_flow_graph;