From d20183dbbff4b59da48aedf28e1eb38f55681b58 Mon Sep 17 00:00:00 2001 From: csmoe Date: Thu, 26 Sep 2019 05:30:10 +0000 Subject: remove bit_set re-export from rustc_data_structures --- src/librustc_data_structures/graph/implementation/mod.rs | 2 +- src/librustc_data_structures/graph/iterate/mod.rs | 2 +- src/librustc_data_structures/lib.rs | 2 +- src/librustc_data_structures/stable_hasher.rs | 2 +- src/librustc_data_structures/transitive_relation.rs | 2 +- src/librustc_data_structures/work_queue.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/librustc_data_structures') diff --git a/src/librustc_data_structures/graph/implementation/mod.rs b/src/librustc_data_structures/graph/implementation/mod.rs index d2699004c81..052a09c0774 100644 --- a/src/librustc_data_structures/graph/implementation/mod.rs +++ b/src/librustc_data_structures/graph/implementation/mod.rs @@ -20,7 +20,7 @@ //! the field `next_edge`). Each of those fields is an array that should //! be indexed by the direction (see the type `Direction`). -use crate::bit_set::BitSet; +use rustc_index::bit_set::BitSet; use crate::snapshot_vec::{SnapshotVec, SnapshotVecDelegate}; use std::fmt::Debug; use std::usize; diff --git a/src/librustc_data_structures/graph/iterate/mod.rs b/src/librustc_data_structures/graph/iterate/mod.rs index cbf6a0a3c03..999c5df7b86 100644 --- a/src/librustc_data_structures/graph/iterate/mod.rs +++ b/src/librustc_data_structures/graph/iterate/mod.rs @@ -1,6 +1,6 @@ use super::super::indexed_vec::IndexVec; use super::{DirectedGraph, WithNumNodes, WithSuccessors, WithStartNode}; -use crate::bit_set::BitSet; +use rustc_index::bit_set::BitSet; #[cfg(test)] mod tests; diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs index e28ee48201c..6a4602da36d 100644 --- a/src/librustc_data_structures/lib.rs +++ b/src/librustc_data_structures/lib.rs @@ -37,7 +37,7 @@ extern crate libc; extern crate cfg_if; pub use rustc_serialize::hex::ToHex; -pub use rustc_index::{bit_set, indexed_vec, newtype_index}; +pub use rustc_index::{indexed_vec, newtype_index}; #[inline(never)] #[cold] diff --git a/src/librustc_data_structures/stable_hasher.rs b/src/librustc_data_structures/stable_hasher.rs index 53dff794ff0..7f17a1aed62 100644 --- a/src/librustc_data_structures/stable_hasher.rs +++ b/src/librustc_data_structures/stable_hasher.rs @@ -3,7 +3,7 @@ use std::mem; use smallvec::SmallVec; use crate::sip128::SipHasher128; use crate::indexed_vec; -use crate::bit_set; +use rustc_index::bit_set; /// When hashing something that ends up affecting properties like symbol names, /// we want these symbol names to be calculated independently of other factors diff --git a/src/librustc_data_structures/transitive_relation.rs b/src/librustc_data_structures/transitive_relation.rs index 9c5447f3f5a..f0a9c3afc68 100644 --- a/src/librustc_data_structures/transitive_relation.rs +++ b/src/librustc_data_structures/transitive_relation.rs @@ -1,4 +1,4 @@ -use crate::bit_set::BitMatrix; +use rustc_index::bit_set::BitMatrix; use crate::fx::FxHashMap; use crate::stable_hasher::{HashStable, StableHasher}; use crate::sync::Lock; diff --git a/src/librustc_data_structures/work_queue.rs b/src/librustc_data_structures/work_queue.rs index 193025aafad..2c0e2261fee 100644 --- a/src/librustc_data_structures/work_queue.rs +++ b/src/librustc_data_structures/work_queue.rs @@ -1,4 +1,4 @@ -use crate::bit_set::BitSet; +use rustc_index::bit_set::BitSet; use crate::indexed_vec::Idx; use std::collections::VecDeque; -- cgit 1.4.1-3-g733a5