Clean up Path and Task code

Author: José Valim

lib/elixir/lib/path.ex

@@ -63,7 +63,7 @@ defmodule Path do
       :relative -> join(relative_to, path)
       :absolute ->
         cond do
-          :binary.first(path) == ?/ and size(path) == 1 ->
+          path == "/" ->
             path
           :binary.last(path) == ?/ ->
             binary_part(path, 0, byte_size(path) - 1)

lib/elixir/lib/task.ex

@@ -156,7 +156,7 @@ defmodule Task do
         reply
       {:DOWN, ^ref, _, _, :noconnection} ->
         mfa = {__MODULE__, :await, [task, timeout]}
-        exit({{:nodedown, get_node(task.pid)}, mfa})
+        exit({{:nodedown, node(task.pid)}, mfa})
       {:DOWN, ^ref, _, _, reason} ->
         exit({reason, {__MODULE__, :await, [task, timeout]}})
     after
@@ -198,7 +198,7 @@ defmodule Task do
     find = fn(%Task{ref: task_ref}) -> task_ref == ref end
     case Enum.find(tasks, find) do
       %Task{pid: pid} when reason == :noconnection ->
-        exit({{:nodedown, get_node(pid)}, {__MODULE__, :find, [tasks, msg]}})
+        exit({{:nodedown, node(pid)}, {__MODULE__, :find, [tasks, msg]}})
       %Task{} ->
         exit({reason, {__MODULE__, :find, [tasks, msg]}})
       nil ->
@@ -209,7 +209,4 @@ defmodule Task do
   def find(_tasks, _msg) do
     nil
   end
-
-  defp get_node({_, n}) when is_atom(n), do: n
-  defp get_node(pid) when is_pid(pid),     do: pid
 end

lib/elixir/lib/task/supervised.ex

@@ -2,7 +2,7 @@ defmodule Task.Supervised do
   @moduledoc false
 
   def start_link(fun) do
-    :proc_lib.start_link(__MODULE__, :noreply, [fun])
+    {:ok, :proc_lib.spawn_link(__MODULE__, :noreply, [fun])}
   end
 
   def start_link(caller, fun) do
@@ -45,7 +45,6 @@ defmodule Task.Supervised do
   end
 
   def noreply(mfa) do
-    :proc_lib.init_ack({:ok, self()})
     apply(mfa)
   end
 

lib/elixir/test/elixir/task_test.exs

@@ -91,9 +91,10 @@ defmodule TaskTest do
   end
 
   test "await/1 exits on :noconnection" do
-    node = {:unknown, :unknown@node}
-    assert catch_noconnection(node) == {:nodedown, :unknown@node}
-    assert catch_noconnection(self) == {:nodedown, self}
+    ref  = make_ref()
+    task = %Task{ref: ref, pid: self()}
+    send self(), {:DOWN, ref, self(), self(), :noconnection}
+    assert catch_exit(Task.await(task)) |> elem(0) == {:nodedown, :nonode@nohost}
   end
 
   test "find/2" do
@@ -106,11 +107,4 @@ defmodule TaskTest do
     assert catch_exit(Task.find([task], msg)) ==
            {:kill, {Task, :find, [[task], msg]}}
   end
-
-  defp catch_noconnection(process) do
-    ref  = make_ref()
-    task = %Task{ref: ref, pid: process}
-    send self(), {:DOWN, ref, process, self(), :noconnection}
-    catch_exit(Task.await(task)) |> elem(0)
-  end
 end