Skip to content

Commit 840de07

Browse files
committed
auto merge of #19955 : Gankro/rust/kill-all-code, r=aturon
EnumSet lives on in libcollections so that librustc can still use it. This adds a direct dependency on libcollections to librustc and libserialize. Should not be merged until rust-lang/rfcs#509 is accepted. All of these collections have already been moved to collect-rs where they will ideally be maintained and experimented with, or will be replaced by something better: https://github.com/Gankro/collect-rs/ [breaking-change] r? @aturon @alexcrichton
2 parents 99d6956 + 67d3823 commit 840de07

File tree

20 files changed

+65
-6813
lines changed

20 files changed

+65
-6813
lines changed

src/libcollections/lib.rs

-22
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ pub use dlist::DList;
4646
pub use enum_set::EnumSet;
4747
pub use ring_buf::RingBuf;
4848
pub use string::String;
49-
pub use tree_map::TreeMap;
50-
pub use tree_set::TreeSet;
51-
pub use trie_map::TrieMap;
52-
pub use trie_set::TrieSet;
5349
pub use vec::Vec;
5450
pub use vec_map::VecMap;
5551

@@ -61,8 +57,6 @@ mod btree;
6157
pub mod dlist;
6258
pub mod enum_set;
6359
pub mod ring_buf;
64-
mod tree;
65-
mod trie;
6660
pub mod slice;
6761
pub mod str;
6862
pub mod string;
@@ -77,22 +71,6 @@ pub mod bitv_set {
7771
pub use bit::{BitvSet, BitPositions, TwoBitPositions};
7872
}
7973

80-
pub mod tree_map {
81-
pub use tree::map::*;
82-
}
83-
84-
pub mod tree_set {
85-
pub use tree::set::*;
86-
}
87-
88-
pub mod trie_map {
89-
pub use trie::map::*;
90-
}
91-
92-
pub mod trie_set {
93-
pub use trie::set::*;
94-
}
95-
9674
pub mod btree_map {
9775
pub use btree::map::*;
9876
}

0 commit comments

Comments
 (0)