diff options
| author | csmoe <csmoe@msn.com> | 2019-09-26 03:26:16 +0000 |
|---|---|---|
| committer | csmoe <csmoe@msn.com> | 2019-09-29 16:11:30 +0000 |
| commit | 17990637b3e4e17fd5fcd3a94bf03963c38b5753 (patch) | |
| tree | ebacc7af683301da55e20f338205c95bb08a9dfc | |
| parent | 1cff2e65570cbbf973bfe0c33edaaa914d385054 (diff) | |
| download | rust-17990637b3e4e17fd5fcd3a94bf03963c38b5753.tar.gz rust-17990637b3e4e17fd5fcd3a94bf03963c38b5753.zip | |
move bit_set into rustc_index
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/librustc_data_structures/lib.rs | 3 | ||||
| -rw-r--r-- | src/librustc_index/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/librustc_index/bit_set.rs (renamed from src/librustc_data_structures/bit_set.rs) | 0 | ||||
| -rw-r--r-- | src/librustc_index/bit_set/tests.rs (renamed from src/librustc_data_structures/bit_set/tests.rs) | 0 | ||||
| -rw-r--r-- | src/librustc_index/lib.rs | 1 |
6 files changed, 4 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index fd4b8f3e16c..59505ff7ed7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3469,6 +3469,7 @@ name = "rustc_index" version = "0.0.0" dependencies = [ "serialize", + "smallvec", ] [[package]] diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs index a9ef297fa99..e28ee48201c 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::{indexed_vec, newtype_index}; +pub use rustc_index::{bit_set, indexed_vec, newtype_index}; #[inline(never)] #[cold] @@ -69,7 +69,6 @@ pub mod macros; pub mod svh; pub mod base_n; pub mod binary_search_util; -pub mod bit_set; pub mod box_region; pub mod const_cstr; pub mod flock; diff --git a/src/librustc_index/Cargo.toml b/src/librustc_index/Cargo.toml index 10e66ffe590..b1ebc95e488 100644 --- a/src/librustc_index/Cargo.toml +++ b/src/librustc_index/Cargo.toml @@ -11,3 +11,4 @@ doctest = false [dependencies] rustc_serialize = { path = "../libserialize", package = "serialize" } +smallvec = { version = "0.6.7", features = ["union", "may_dangle"] } diff --git a/src/librustc_data_structures/bit_set.rs b/src/librustc_index/bit_set.rs index fe8ef642430..fe8ef642430 100644 --- a/src/librustc_data_structures/bit_set.rs +++ b/src/librustc_index/bit_set.rs diff --git a/src/librustc_data_structures/bit_set/tests.rs b/src/librustc_index/bit_set/tests.rs index ac7913815ff..ac7913815ff 100644 --- a/src/librustc_data_structures/bit_set/tests.rs +++ b/src/librustc_index/bit_set/tests.rs diff --git a/src/librustc_index/lib.rs b/src/librustc_index/lib.rs index c4c4948e7bf..d70f51aec01 100644 --- a/src/librustc_index/lib.rs +++ b/src/librustc_index/lib.rs @@ -3,3 +3,4 @@ #![feature(fn_traits)] pub mod indexed_vec; +pub mod bit_set; |