Resolve review comments

Co-authored-by: Lyndon White <[email protected]>

Author: jonas-schulze

src/DataStructures.jl

@@ -5,9 +5,7 @@ module DataStructures
                 isbitsunion, isiterable, dict_with_eltype, KeySet, Callable, _tablesz,
                 findnextnot, unsafe_getindex, unsafe_setindex!, peek
 
-    if !isdefined(Base, :popat!)
-        export popat!
-    end
+    export popat!  # Export for old version of julia where Base doesn't export this
 
 
     using Compat # Provides Base.Order.ReverseOrdering(). May remove this line with julia 1.4

src/priorityqueue.jl

@@ -274,13 +274,11 @@ function Base.popfirst!(pq::PriorityQueue)
     return x
 end
 
-if isdefined(Base, :popat!)
-    Base.popat!(pq::PriorityQueue, key) = _popat!(pq, key)
-else
-    popat!(pq::PriorityQueue, key) = _popat!(pq, key)
+if isdefined(Base, :popat!)  # We will overload if it is defined, else we define on our own
+    import Base: popat!
 end
 
-function _popat!(pq::PriorityQueue, key)
+function popat!(pq::PriorityQueue, key)
     idx = pq.index[key]
     force_up!(pq, idx)
     popfirst!(pq)