CompatHelper: bump compat for DataStructures to 0.19, (keep existing compat) (#144)

* CompatHelper: bump compat for DataStructures to 0.19, (keep existing compat)

* corrections

* fixes

* remove non-canonical print from doctest

* jet warnings

---------

Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org>
Co-authored-by: Stefan Krastanov <github.acc@krastanov.org>

Author: 3 people

CHANGELOG.md

@@ -1,5 +1,9 @@
 # News
 
+## v1.5.1 - 2025-08-15
+
+- Bump DataStructures to 0.19.
+
 ## v1.5.0 - 2024-11-23
 
 - Bump ResumableFunctions compat to 1.0.0.

Project.toml

@@ -5,15 +5,15 @@ license = "MIT"
 desc = "A discrete event process oriented simulation framework."
 authors = ["Ben Lauwens and SimJulia, ConcurrentSim, QuantumSavory contributors"]
 repo = "https://github.com/JuliaDynamics/ConcurrentSim.jl.git"
-version = "1.5.0"
+version = "1.5.1"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 ResumableFunctions = "c5292f4c-5179-55e1-98c5-05642aab7184"
 
 [compat]
-DataStructures = "0.18"
+DataStructures = "0.19"
 Dates = "1"
 ResumableFunctions = "1"
 julia = "1.10"

docs/src/guides/events.md

@@ -50,8 +50,7 @@ ConcurrentSim.Simulation time: 0.0 active_process: nothing
 julia> ev = Event(sim)
 ConcurrentSim.Event 1
 
-julia> @callback my_callback(ev)
-#1 (generic function with 1 method)
+julia> @callback my_callback(ev);
 
 julia> succeed(ev)
 ConcurrentSim.Event 1

src/ConcurrentSim.jl

@@ -13,7 +13,7 @@ module ConcurrentSim
   export AbstractEvent, Environment, value, state, environment
   export Event, succeed, fail, @callback, remove_callback
   export timeout
-  export Operator, (&), (|), AllOf, AnyOf
+  export Operator, &, |, AllOf, AnyOf
   export @resumable, @yield
   export AbstractProcess, Simulation, run, now, active_process, StopSimulation
   export Process, @process, interrupt

src/resources/base.jl

@@ -29,27 +29,27 @@ end
 function trigger_put(put_ev::ResourceEvent, res::AbstractResource)
   queue = DataStructures.PriorityQueue(res.put_queue)
   while length(queue) > 0
-    (put_ev, key) = DataStructures.peek(queue)
+    (put_ev, key) = DataStructures.first(queue)
     proceed = do_put(res, put_ev, key)
-    state(put_ev) === scheduled && DataStructures.dequeue!(res.put_queue, put_ev)
-    proceed ? DataStructures.dequeue!(queue) : break
+    state(put_ev) === scheduled && DataStructures.popat!(res.put_queue, put_ev)
+    proceed ? DataStructures.popfirst!(queue) : break
   end
 end
 
 function trigger_get(get_ev::ResourceEvent, res::AbstractResource)
   queue = DataStructures.PriorityQueue(res.get_queue)
   while length(queue) > 0
-    (get_ev, key) = DataStructures.peek(queue)
+    (get_ev, key) = DataStructures.first(queue)
     proceed = do_get(res, get_ev, key)
-    state(get_ev) === scheduled && DataStructures.dequeue!(res.get_queue, get_ev)
-    proceed ? DataStructures.dequeue!(queue) : break
+    state(get_ev) === scheduled && DataStructures.popat!(res.get_queue, get_ev)
+    proceed ? DataStructures.popfirst!(queue) : break
   end
 end
 
 function cancel(res::AbstractResource, put_ev::Put)
-  DataStructures.dequeue!(res.put_queue, put_ev)
+  DataStructures.popat!(res.put_queue, put_ev)
 end
 
 function cancel(res::AbstractResource, get_ev::Get)
-  DataStructures.dequeue!(res.get_queue, get_ev)
+  DataStructures.popat!(res.get_queue, get_ev)
 end

src/resources/ordered_stores.jl

@@ -89,7 +89,7 @@ end
 function do_put(sto::QueueStore{N, T}, put_ev::Put, key::StorePutKey{N, T}) where {N, T<:Number}
   if sto.load < sto.capacity
     sto.load += one(UInt)
-    enqueue!(sto.items, key.item)
+    push!(sto.items, key.item)
     schedule(put_ev)
   end
   false
@@ -98,7 +98,7 @@ end
 function do_get(sto::QueueStore{N, T}, get_ev::Get, key::StoreGetKey{T}) where {N, T<:Number}
   key.filter !== get_any_item && error("Filtering not supported for `QueueStore`. Use an unordered store instead, or submit a feature request for implementing filtering to our issue tracker.")
   isempty(sto.items) && return true
-  item = dequeue!(sto.items)
+  item = popfirst!(sto.items)
   sto.load -= one(UInt)
   schedule(get_ev; value=item)
   true

src/simulations.jl

@@ -31,8 +31,8 @@ end
 
 function step(sim::Simulation)
   isempty(sim.heap) && throw(EmptySchedule())
-  (bev, key) = DataStructures.peek(sim.heap)
-  DataStructures.dequeue!(sim.heap)
+  (bev, key) = DataStructures.first(sim.heap)
+  DataStructures.popfirst!(sim.heap)
   sim.time = key.time
   bev.state = processed
   for callback in bev.callbacks

test/test_jet.jl

@@ -11,6 +11,7 @@ using InteractiveUtils
         )
     )
     @show rep
-    @test_broken length(JET.get_reports(rep)) == 0
-    @test length(JET.get_reports(rep)) <= 1
+    @test length(JET.get_reports(rep)) == 0 # use setup below in case there are warnings
+    #@test_broken length(JET.get_reports(rep)) == 0
+    #@test length(JET.get_reports(rep)) <= 123
 end