Use OrderedCollections

Closes #392
JuliaCollections · Sep 16, 2018 · 62a6449 · 62a6449
1 parent bdd7aa0
commit 62a6449
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 565 deletions.
diff --git a/Project.toml b/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"

diff --git a/src/DataStructures.jl b/src/DataStructures.jl
@@ -16,7 +16,9 @@ module DataStructures
                  eachindex, keytype, valtype
     import Base: iterate
 
-    using InteractiveUtils: methodswith
+    using OrderedCollections
+    using OrderedCollections: not_iterator_of_pairs, rehash!
+    import OrderedCollections: filter, filter!, isordered
 
     export complement, complement!
 
@@ -67,9 +69,6 @@ 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("trie.jl")
 

diff --git a/src/dict_support.jl b/src/dict_support.jl