try formatter v2 again and bump DataStructures.jl to avoid warnings

.github/pull_request_template.md

@@ -1,7 +1,3 @@
 Please make sure to leave this PR editable by maintainers of this repo.
 
 Please make sure you have consulted [CONTRIBUTING](https://github.com/JuliaGraphs/Graphs.jl/blob/master/CONTRIBUTING.md)
-
-The linter bot might add new commits to your PR (e.g. to take care of formatting issues). Feel free to overwrite these commits. 
-
-If the linter bot is the last one to put in a commit, **THE TESTS WILL NOT RUN**. Either lint/format your contributions yourself as described in CONTRIBUTING.md or close&reopen the PR to reset the test runner.

Project.toml

@@ -21,12 +21,12 @@ GraphsSharedArraysExt = "SharedArrays"
 
 [compat]
 ArnoldiMethod = "0.4"
+DataStructures = "0.19"
 Distributed = "1"
-DataStructures = "0.18, 0.19"
 Inflate = "0.1.3"
 LinearAlgebra = "1"
 Random = "1"
-SharedArrays = "1" 
+SharedArrays = "1"
 SimpleTraits = "0.9.1"
 SparseArrays = "1"
 Statistics = "1"

src/Experimental/ShortestPaths/ShortestPaths.jl

@@ -4,7 +4,7 @@ using Graphs
 using Graphs.Experimental.Traversals
 using Graphs: AbstractGraph, AbstractEdge
 using Graphs.SimpleGraphs: AbstractSimpleGraph
-using DataStructures: PriorityQueue, enqueue!, dequeue!
+using DataStructures: PriorityQueue
 
 import Graphs.Experimental.Traversals:
     initfn!, previsitfn!, newvisitfn!, visitfn!, postvisitfn!, postlevelfn!

src/Experimental/ShortestPaths/astar.jl

@@ -56,7 +56,7 @@ function a_star_impl!(
     total_path = Vector{T}()
 
     @inbounds while !isempty(open_set)
-        current = dequeue!(open_set)
+        current = popfirst!(open_set).first
 
         if current == goal
             reconstruct_path!(total_path, came_from, current, g)
@@ -104,7 +104,7 @@ function shortest_paths(
     checkbounds(distmx, Base.OneTo(nv(g)), Base.OneTo(nv(g)))
 
     open_set = PriorityQueue{Integer,T}()
-    enqueue!(open_set, s, 0)
+    push!(open_set, s => 0)
 
     closed_set = zeros(Bool, nv(g))
 

src/Experimental/ShortestPaths/dijkstra.jl

@@ -66,7 +66,7 @@ function shortest_paths(
     sizehint!(closest_vertices, nvg)
 
     while !isempty(H)
-        u = dequeue!(H)
+        u = popfirst!(H).first
 
         if alg.track_vertices
             push!(closest_vertices, u)

src/Experimental/Traversals/bfs.jl

@@ -1,4 +1,3 @@
-import Base.Sort, Base.Sort.Algorithm
 import Base: sort!
 
 struct NOOPSortAlg <: Base.Sort.Algorithm end

src/Experimental/vf2.jl

@@ -489,7 +489,7 @@ function has_induced_subgraphisomorph(
     edge_relation::Union{Nothing,Function}=nothing,
 )::Bool
     result = false
-    callback(vmap) = (result = true; return false)
+    callback(vmap) = (result=true; return false)
     vf2(
         callback,
         g1,
@@ -509,7 +509,7 @@ function has_subgraphisomorph(
     edge_relation::Union{Nothing,Function}=nothing,
 )::Bool
     result = false
-    callback(vmap) = (result = true; return false)
+    callback(vmap) = (result=true; return false)
     vf2(
         callback,
         g1,
@@ -531,7 +531,7 @@ function has_isomorph(
     !could_have_isomorph(g1, g2) && return false
 
     result = false
-    callback(vmap) = (result = true; return false)
+    callback(vmap) = (result=true; return false)
     vf2(
         callback,
         g1,
@@ -648,8 +648,6 @@ function all_subgraphisomorph(
 end
 
 #! format: off
-# Turns off formatting from this point onwards
-
 function all_isomorph(
     g1::AbstractGraph,
     g2::AbstractGraph,
@@ -672,6 +670,4 @@ function all_isomorph(
     end
     return ch
 end
-
 #! format: on
-# Turns on formatting from this point onwards

src/Graphs.jl

@@ -8,15 +8,11 @@ using Statistics: mean
 
 using Inflate: InflateGzipStream
 using DataStructures:
-    IntDisjointSets,
+    IntDisjointSet,
     PriorityQueue,
-    dequeue!,
-    dequeue_pair!,
-    enqueue!,
     heappop!,
     heappush!,
     in_same_set,
-    peek,
     union!,
     find_root!,
     BinaryMaxHeap,

src/SimpleGraphs/generators/randgraphs.jl

@@ -1164,7 +1164,7 @@ function stochastic_block_model(
         for b in a:K
             ((a == b) && !(c[a, b] <= n[b] - 1)) ||
                 ((a != b) && !(c[a, b] <= n[b])) && error(
-                    "Mean degree cannot be greater than available neighbors in the block.",
+                    "Mean degree cannot be greater than available neighbors in the block."
                 ) # TODO 0.7: turn into some other error?
 
             m = a == b ? div(n[a] * (n[a] - 1), 2) : n[a] * n[b]