Use OrderedCollections

Closes #392

Author: timholy

Project.toml

@@ -4,6 +4,7 @@ version = "0.12.0"
 
 [deps]
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/DataStructures.jl

@@ -16,7 +16,9 @@ module DataStructures
                  eachindex, keytype, valtype
     import Base: iterate
 
-    using InteractiveUtils: methodswith
+    using OrderedCollections
+    using OrderedCollections: rehash!
+    import OrderedCollections: filter, filter!, isordered
 
     export complement, complement!
 
@@ -67,10 +69,8 @@ module DataStructures
     include("disjoint_set.jl")
     include("heaps.jl")
 
-    include("dict_support.jl")
-    include("ordered_dict.jl")
-    include("ordered_set.jl")
     include("default_dict.jl")
+    include("dict_support.jl")
     include("trie.jl")
 
     include("int_set.jl")

src/dict_support.jl

@@ -1,9 +1,6 @@
 # support functions
 
-# _tablesz and hashindex are defined in Base, but are not exported,
-# so they are redefined here.
-_tablesz(x::Integer) = x < 16 ? 16 : one(x)<<((sizeof(x)<<3)-leading_zeros(x-1))
-hashindex(key, sz) = (reinterpret(Int,(hash(key))) & (sz-1)) + 1
+using InteractiveUtils: methodswith
 
 function not_iterator_of_pairs(kv)
     return any(x->isempty(methodswith(typeof(kv), x, true)),