Tiny improvements

lib/hardhat/builder.ex

@@ -4,8 +4,14 @@ defmodule Hardhat.Builder do
   defmacro __using__(opts \\ []) do
     strategy =
       case Keyword.get(opts, :strategy, :fuse) do
-        v when v in [:fuse, :regulator, :none] -> v
-        invalid -> raise "Invalid strategy #{inspect(invalid)}"
+        v when v in [:fuse, :regulator, :none] ->
+          v
+
+        invalid ->
+          raise CompileError,
+            description: "Invalid strategy #{inspect(invalid)}",
+            file: __CALLER__.file,
+            line: __CALLER__.line
       end
 
     opts = opts |> Keyword.delete(:strategy) |> Keyword.put_new(:docs, false)

lib/hardhat/defaults.ex

@@ -34,7 +34,7 @@ defmodule Hardhat.Defaults do
   end
 
   def should_melt({:ok, %Tesla.Env{} = env}) do
-    env.status >= 500 || env.status == 429
+    env.status >= 500 or env.status == 429
   end
 
   @doc """
@@ -112,7 +112,7 @@ defmodule Hardhat.Defaults do
   def should_retry({:error, _}), do: true
 
   def should_retry({:ok, %Tesla.Env{} = env}) do
-    env.method !== :post && (env.status == 429 || env.status >= 500)
+    env.method != :post and (env.status == 429 or env.status >= 500)
   end
 
   @doc """
@@ -154,7 +154,7 @@ defmodule Hardhat.Defaults do
   end
 
   def should_regulate({:ok, %Tesla.Env{} = env}) do
-    env.status >= 500 || env.status == 429
+    env.status >= 500 or env.status == 429
   end
 
   @doc """

lib/hardhat/middleware/path_params.ex

@@ -10,11 +10,11 @@ defmodule Hardhat.Middleware.PathParams do
   @impl Tesla.Middleware
   def call(env, next, _) do
     env =
-      if env.opts[:path_params] do
+      if path_params = env.opts[:path_params] do
         urlsafe =
-          env.opts[:path_params]
-          |> Enum.map(fn {key, value} -> {key, URI.encode(value, &URI.char_unreserved?/1)} end)
-          |> Enum.to_list()
+          Enum.map(path_params, fn {key, value} ->
+            {key, URI.encode(value, &URI.char_unreserved?/1)}
+          end)
 
         Tesla.put_opt(env, :path_params, urlsafe)
       else

lib/hardhat/middleware/timeout.ex

@@ -43,15 +43,17 @@ defmodule Hardhat.Middleware.Timeout do
       end
 
     task =
-      safe_async(fn ->
-        if is_deadline, do: Deadline.set(timeout)
-        Tesla.run(env, next)
-      end)
+      if is_deadline do
+        safe_async(fn ->
+          Deadline.set(timeout)
+          Tesla.run(env, next)
+        end)
+      else
+        safe_async(fn -> Tesla.run(env, next) end)
+      end
 
     try do
-      task
-      |> Task.await(timeout)
-      |> repass_error
+      Task.await(task, timeout)
     catch
       :exit, {:timeout, _} ->
         Task.shutdown(task, 0)
@@ -62,6 +64,18 @@ defmodule Hardhat.Middleware.Timeout do
         )
 
         {:error, :timeout}
+    else
+      {:exception, error, stacktrace} ->
+        reraise(error, stacktrace)
+
+      {:throw, value} ->
+        throw(value)
+
+      {:exit, value} ->
+        exit(value)
+
+      {:ok, result} ->
+        result
     end
   end
 
@@ -78,12 +92,4 @@ defmodule Hardhat.Middleware.Timeout do
       end
     end)
   end
-
-  defp repass_error({:exception, error, stacktrace}), do: reraise(error, stacktrace)
-
-  defp repass_error({:throw, value}), do: throw(value)
-
-  defp repass_error({:exit, value}), do: exit(value)
-
-  defp repass_error({:ok, result}), do: result
 end