Fewer ok

Author: josevalim

lib/elixir/lib/module/types/expr.ex

@@ -305,7 +305,8 @@ defmodule Module.Types.Expr do
       when not is_atom(callee) and is_atom(key_or_fun) do
     with {:ok, type, context} <- of_expr(callee, stack, context) do
       if Keyword.get(meta, :no_parens, false) do
-        Of.map_fetch(expr, type, key_or_fun, stack, context)
+        {type, context} = Of.map_fetch(expr, type, key_or_fun, stack, context)
+        {:ok, type, context}
       else
         {mods, context} = Of.remote(type, key_or_fun, 0, [:dot], expr, meta, stack, context)
         {type, context} = apply_many(mods, key_or_fun, [], expr, stack, context)

lib/elixir/lib/module/types/of.ex

@@ -79,11 +79,10 @@ defmodule Module.Types.Of do
   def map_fetch(expr, type, field, stack, context) when is_atom(field) do
     case map_fetch(type, field) do
       {_optional?, value_type} ->
-        {:ok, value_type, context}
+        {value_type, context}
 
       reason ->
-        {:ok, dynamic(),
-         error({reason, expr, type, field, context}, elem(expr, 1), stack, context)}
+        {dynamic(), error({reason, expr, type, field, context}, elem(expr, 1), stack, context)}
     end
   end
 

lib/elixir/lib/module/types/pattern.ex

@@ -663,7 +663,8 @@ defmodule Module.Types.Pattern do
   def of_guard({{:., _, [callee, key]}, _, []} = map_fetch, _expected, expr, stack, context)
       when not is_atom(callee) do
     with {:ok, type, context} <- of_guard(callee, dynamic(), expr, stack, context) do
-      Of.map_fetch(map_fetch, type, key, stack, context)
+      {type, context} = Of.map_fetch(map_fetch, type, key, stack, context)
+      {:ok, type, context}
     end
   end