Tidy up previous commits

Author: José Valim

lib/elixir/lib/file.ex

@@ -743,7 +743,9 @@ defmodule File do
 
   @doc """
   Tries to delete the file `path`.
+
   Returns `:ok` if successful, or `{:error, reason}` if an error occurs.
+  Note the file is deleted even if in read-only mode.
 
   Typical error reasons are:
 
@@ -765,16 +767,27 @@ defmodule File do
   """
   @spec rm(Path.t) :: :ok | {:error, posix}
   def rm(path) do
+    path = IO.chardata_to_string(path)
+    case F.delete(path) do
+      :ok ->
+        :ok
+      {:error, :eaccess} = e ->
+        change_mode_windows(path) || e
+      {:error, _} = e ->
+        e
+    end
+  end
+
+  defp change_mode_windows(path) do
     if match? {:win32, _}, :os.type do
       case F.read_file_info(IO.chardata_to_string(path)) do
-        {:ok, file_info} ->
-          if elem(file_info, 3) in [:read, :none] do
-            File.chmod(path, (elem(file_info, 7) + 0200))
-          end
-        {:error, reason} -> {:error, reason}
+        {:ok, file_info} when elem(file_info, 3) in [:read, :none] ->
+          File.chmod(path, (elem(file_info, 7) + 0200))
+          F.delete(path)
+        _ ->
+          nil
       end
     end
-    F.delete(IO.chardata_to_string(path))
   end
 
   @doc """

lib/iex/lib/iex/server.ex

@@ -128,7 +128,7 @@ defmodule IEx.Server do
 
   defp exit_loop(evaluator, evaluator_ref, done? \\ true) do
     Process.delete(:evaluator)
-    Process.demonitor(evaluator_ref)
+    Process.demonitor(evaluator_ref, [:flush])
     if done? do
       send(evaluator, {:done, self})
     end

lib/mix/lib/mix/utils.ex

@@ -405,10 +405,10 @@ defmodule Mix.Utils do
     if http_proxy = System.get_env("HTTP_PROXY"), do: proxy(http_proxy)
     if https_proxy = System.get_env("HTTPS_PROXY"), do: proxy(https_proxy)
 
-    # We are using relaxed: true because some clients (namely Github pages
-    # which we are using to download rebar) is returning a Location header
-    # with relative paths, which does not follow the spec. This would cause
-    # the request to fail with {:error, :no_scheme} unless :relaxed is given.
+    # We are using relaxed: true because some clients is returning a Location
+    # header with relative paths, which does not follow the spec. This would
+    # cause the request to fail with {:error, :no_scheme} unless :relaxed
+    # is given.
     case :httpc.request(:get, request, [relaxed: true], [body_format: :binary], :mix) do
       {:ok, {{_, status, _}, _, body}} when status in 200..299 ->
         body
@@ -417,6 +417,7 @@ defmodule Mix.Utils do
       {:error, reason} ->
         Mix.raise "Could not access url #{path}, error: #{inspect reason}"
     end
+  after
     :inets.stop(:httpc, :mix)
   end