Fix build errors, use :gb_trees.next instead of matching on opaque type.

Author: jweinkam

lib/app.ex

@@ -12,7 +12,7 @@ defmodule HashRing.App do
       start: {HashRing.Worker, :start_link, [[restart: :transient, name: HashRing.Worker]]}
     }
 
-    DynamicSupervisor.start_child(HashRing.Supervisor, spec)
+    _ = DynamicSupervisor.start_child(HashRing.Supervisor, spec)
 
     # Add any preconfigured rings
     Enum.each(Application.get_env(:libring, :rings, []), fn

lib/managed_ring.ex

@@ -30,32 +30,36 @@ defmodule HashRing.Managed do
           node_type: :all | :hidden | :visible
         ]
 
-  @type child_spec_options :: [
-          :id => atom() | term(),
-          :start => {module, function_name :: atom, args :: [term]},
-          optional(:restart) => restart,
-          optional(:shutdown) => shutdown,
-          optional(:type) => type,
-          optional(:modules) => [module] | :dynamic,
-          optional(:significant) => boolean,
-          :nodes => node_list,
-          :monitor_nodes => boolean,
-          :node_blacklist => pattern_list,
-          :node_whitelist => pattern_list
-        ]
+  @type child_spec_option ::
+          {:id, atom() | term()}
+          | {:start, {module, function_name :: atom, args :: [term]}}
+          | {:restart, :permanent | :transient | :temporary}
+          | {:shutdown, timeout() | :brutal_kill}
+          | {:type, :worker | :supervisor}
+          | {:modules, [module] | :dynamic}
+          | {:significant, boolean}
+          | {:nodes, node_list}
+          | {:monitor_nodes, boolean}
+          | {:node_blacklist, pattern_list}
+          | {:node_whitelist, pattern_list}
+
+  @type child_spec_options :: [child_spec_option()]
 
   @valid_ring_opts [:name, :nodes, :monitor_nodes, :node_blacklist, :node_whitelist, :node_type]
 
-  @spec child_spec(child_spec_options) :: Supervisor.child_spec
+  @spec child_spec(child_spec_options) :: Supervisor.child_spec()
   def child_spec(opts) do
     opts = Keyword.put_new(opts, :name, :hash_ring_manager)
 
-    Keyword.merge(%{
-      id: opts[:id] || opts[:name],
-      type: :worker,
-      restart: :permanent,
-      start: {__MODULE__, :run, [opts[:name], Keyword.take(opts, @valid_ring_opts)]}
-    }, Keyword.drop(opts, @valid_ring_opts))
+    Map.merge(
+      %{
+        id: opts[:id] || opts[:name],
+        type: :worker,
+        restart: :permanent,
+        start: {__MODULE__, :run, [opts[:name], Keyword.take(opts, @valid_ring_opts)]}
+      },
+      Map.new(Keyword.drop(opts, @valid_ring_opts))
+    )
   end
 
   @doc """

lib/ring.ex

@@ -205,8 +205,8 @@ defmodule HashRing do
   def key_to_node(%__MODULE__{ring: r}, key) do
     hash = :erlang.phash2(key, @hash_range)
 
-    case :gb_trees.iterator_from(hash, r) do
-      [{_key, node, _, _} | _] ->
+    case :gb_trees.iterator_from(hash, r) |> :gb_trees.next() do
+      {_key, node, _} ->
         node
 
       _ ->
@@ -244,8 +244,8 @@ defmodule HashRing do
     hash = :erlang.phash2(key, @hash_range)
     count = min(length(nodes), count)
 
-    case :gb_trees.iterator_from(hash, r) do
-      [{_key, node, _, _} | _] = iter ->
+    case :gb_trees.iterator_from(hash, r) |> :gb_trees.next() do
+      {_key, node, iter} ->
         find_nodes_from_iter(iter, count - 1, [node])
 
       _ ->
@@ -262,7 +262,6 @@ defmodule HashRing do
         if node in results do
           find_nodes_from_iter(iter, count, results)
         else
-          [node | results]
           find_nodes_from_iter(iter, count - 1, [node | results])
         end
 

mix.exs

@@ -16,7 +16,7 @@ defmodule HashRing.Mixfile do
       docs: docs(),
       deps: deps(),
       dialyzer: [
-        flags: ~w(-Wunmatched_returns -Werror_handling -Wrace_conditions -Wno_opaque -Wunderspecs)
+        flags: ~w(-Wunmatched_returns -Werror_handling -Wno_opaque -Wunderspecs)
       ],
       preferred_cli_env: [
         docs: :docs,