Remove warnings on latest Elixir

Author: José Valim

lib/consumer_supervisor.ex

@@ -254,7 +254,7 @@ defmodule ConsumerSupervisor do
 
   """
   @spec which_children(Supervisor.supervisor()) :: [
-          {:undefined, pid | :restarting, Supervisor.Spec.worker(), Supervisor.Spec.modules()}
+          {:undefined, pid | :restarting, :worker | :supervisor, :dynamic | [module()]}
         ]
   def which_children(supervisor) do
     call(supervisor, :which_children)

lib/gen_stage.ex

@@ -132,7 +132,7 @@ defmodule GenStage do
       defmodule C do
         use GenStage
 
-        def start_link() do
+        def start_link(_opts) do
           GenStage.start_link(C, :ok)
         end
 
@@ -156,7 +156,7 @@ defmodule GenStage do
 
       {:ok, a} = A.start_link(0)  # starting from zero
       {:ok, b} = B.start_link(2)  # multiply by 2
-      {:ok, c} = C.start_link()   # state does not matter
+      {:ok, c} = C.start_link([]) # state does not matter
 
       GenStage.sync_subscribe(c, to: b)
       GenStage.sync_subscribe(b, to: a)
@@ -258,12 +258,12 @@ defmodule GenStage do
   Then we can define our supervision tree like this:
 
       children = [
-        worker(A, [0]),
-        worker(B, [2]),
-        worker(C, []),
-        worker(C, []),
-        worker(C, []),
-        worker(C, [])
+        {A, [0]},
+        {B, [2]},
+        Supervisor.child_spec({C, []}, id: :c1),
+        Supervisor.child_spec({C, []}, id: :c2),
+        Supervisor.child_spec({C, []}, id: :c3),
+        Supervisor.child_spec({C, []}, id: :c4)
       ]
 
       Supervisor.start_link(children, strategy: :rest_for_one)

mix.exs

@@ -1,7 +1,7 @@
 defmodule GenStage.Mixfile do
   use Mix.Project
 
-  @version "0.14.1"
+  @version "0.15.0"
 
   def project do
     [

test/consumer_supervisor_test.exs

@@ -1,8 +1,6 @@
 defmodule ConsumerSupervisorTest do
   use ExUnit.Case, async: true
 
-  import Supervisor.Spec
-
   defmodule Simple do
     use ConsumerSupervisor
     def init(args), do: args
@@ -116,13 +114,9 @@ defmodule ConsumerSupervisorTest do
 
   describe "init/2" do
     test "supports old child spec" do
-      expected = {
-        :ok,
-        [{Foo, {Foo, :start_link, []}, :permanent, 5000, :worker, [Foo]}],
-        [strategy: :one_for_one]
-      }
-
-      assert expected == ConsumerSupervisor.init([worker(Foo, [])], strategy: :one_for_one)
+      spec = {Foo, {Foo, :start_link, []}, :permanent, 5000, :worker, [Foo]}
+      expected = {:ok, [spec], strategy: :one_for_one}
+      assert ConsumerSupervisor.init([spec], strategy: :one_for_one) == expected
     end
 
     test "supports new child spec as tuple" do
@@ -573,12 +567,14 @@ defmodule ConsumerSupervisorTest do
 
   defmodule Consumer do
     def start_link(opts \\ []) do
-      children = [
-        worker(__MODULE__, [self()], opts ++ [function: :start_child, restart: :temporary])
-      ]
+      spec =
+        opts
+        |> Keyword.take([:restart, :shutdown])
+        |> Keyword.put_new(:restart, :temporary)
+        |> Enum.into(%{id: __MODULE__, start: {__MODULE__, :start_child, [self()]}})
 
       opts = opts ++ [strategy: :one_for_one, max_restarts: 0]
-      ConsumerSupervisor.start_link(children, opts)
+      ConsumerSupervisor.start_link([spec], opts)
     end
 
     def start_child(pid, :ok2) do
@@ -925,6 +921,10 @@ defmodule ConsumerSupervisorTest do
     end
   end
 
+  defp worker(mod, args, extra \\ []) do
+    extra |> Enum.into(%{id: mod, start: {mod, :start_link, args}})
+  end
+
   defp assert_kill(pid, reason) do
     ref = Process.monitor(pid)
     Process.exit(pid, reason)