From 53196aeee4bd7af64e20174fcf00e57860dea079 Mon Sep 17 00:00:00 2001
From: Riley Trautman <rileyt@spiceworks.com>
Date: Wed, 22 Jun 2016 15:16:56 -0500
Subject: [PATCH] Fix compiler warnings for Elixir 1.3

---
 lib/httparrot/cookies_handler.ex      |  4 ++--
 lib/httparrot/general_request_info.ex | 10 +++-------
 lib/httparrot/stream_bytes_handler.ex |  5 ++---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/httparrot/cookies_handler.ex b/lib/httparrot/cookies_handler.ex
index c092d78..be30782 100644
--- a/lib/httparrot/cookies_handler.ex
+++ b/lib/httparrot/cookies_handler.ex
@@ -9,8 +9,8 @@ defmodule HTTParrot.CookiesHandler do
   end
 
   def get_json(req, state) do
-    {cookies, req} = :cowboy_req.cookies(req)
-    if cookies == [], do: cookies = [{}]
+    {cow_cookies, req} = :cowboy_req.cookies(req)
+    cookies = if cow_cookies == [] do [{}] else cow_cookies end
     {response(cookies), req, state}
   end
 
diff --git a/lib/httparrot/general_request_info.ex b/lib/httparrot/general_request_info.ex
index 2dda687..b00552b 100644
--- a/lib/httparrot/general_request_info.ex
+++ b/lib/httparrot/general_request_info.ex
@@ -20,13 +20,9 @@ defmodule HTTParrot.GeneralRequestInfo do
   @spec group_by_keys(list) :: map
   def group_by_keys([]), do: %{}
   def group_by_keys(args) do
-    groups = Enum.group_by(args, %{}, fn {k, _} -> k end)
-    for {k1, v1} <- groups, into: %{} do
-      values = Enum.map(v1, fn {_, v2} -> v2 end)
-        |> Enum.reverse
-        |> flatten_if_list_of_one
-      {k1, values}
-    end
+    Enum.group_by(args, &elem(&1, 0), &elem(&1, 1))
+    |> Enum.map(fn {k, v} -> {k, flatten_if_list_of_one(v)} end)
+    |> Map.new
   end
 
   defp flatten_if_list_of_one([h]), do: h
diff --git a/lib/httparrot/stream_bytes_handler.ex b/lib/httparrot/stream_bytes_handler.ex
index 0edcdc9..42e8d29 100644
--- a/lib/httparrot/stream_bytes_handler.ex
+++ b/lib/httparrot/stream_bytes_handler.ex
@@ -2,7 +2,6 @@ defmodule HTTParrot.StreamBytesHandler do
   @moduledoc """
   Streams n bytes of data, with chunked transfer encoding.
   """
-  alias HTTParrot.GeneralRequestInfo
   use HTTParrot.Cowboy, methods: ~w(GET)
 
   def content_types_provided(req, state) do
@@ -35,9 +34,9 @@ defmodule HTTParrot.StreamBytesHandler do
       Stream.repeatedly(fn -> :random.uniform(255) end)
         |> Stream.take(n)
         |> Enum.chunk(chunk_size, chunk_size, [])
-        |> Enum.each fn chunk ->
+        |> Enum.each(fn chunk ->
           send_func.(List.to_string(chunk))
-        end
+        end)
     end
   end
 end