Transform the struct update syntax into a type assertion

This transforms the struct update into a type assertion,
requiring the type system to be sure the expression has
precisely the given struct type.

The struct update syntax may still be deprecated in the
future but this will provide a safer migration path and
allow us to engage in more conversations with the community.

Author: josevalim

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

@@ -231,21 +231,36 @@ defmodule Module.Types.Expr do
   # %Struct{map | ...}
   # This syntax is deprecated, so we simply traverse.
   def of_expr(
-        {:%, _, [_, {:%{}, _, [{:|, _, [map, args]}]}]} = struct,
+        {:%, meta, [module, {:%{}, _, [{:|, _, [map, pairs]}]}]} = struct,
         _expected,
         expr,
         stack,
         context
       ) do
-    {_, context} = of_expr(map, term(), struct, stack, context)
+    {map_type, context} = of_expr(map, term(), struct, stack, context)
 
     context =
-      Enum.reduce(args, context, fn {key, value}, context when is_atom(key) ->
-        {_, context} = of_expr(value, term(), expr, stack, context)
+      if stack.mode == :traversal do
         context
-      end)
+      else
+        with {false, struct_key_type} <- map_fetch(map_type, :__struct__),
+             {:finite, [^module]} <- atom_fetch(struct_key_type) do
+          context
+        else
+          _ ->
+            error(__MODULE__, {:badupdate, map_type, struct, context}, meta, stack, context)
+        end
+      end
 
-    {dynamic(), context}
+    Enum.reduce(pairs, {map_type, context}, fn {key, value}, {acc, context} ->
+      # TODO: Once we support typed structs, we need to type check them here
+      {type, context} = of_expr(value, term(), expr, stack, context)
+
+      case map_fetch_and_put(acc, key, type) do
+        {_value, acc} -> {acc, context}
+        _ -> {acc, context}
+      end
+    end)
   end
 
   # %{...}
@@ -791,6 +806,55 @@ defmodule Module.Types.Expr do
 
   ## Warning formatting
 
+  def format_diagnostic({:badupdate, type, expr, context}) do
+    {:%, _, [module, {:%{}, _, [{:|, _, [map, _]}]}]} = expr
+    traces = collect_traces(map, context)
+
+    suggestion =
+      case map do
+        {var, meta, context} when is_atom(var) and is_atom(context) ->
+          if capture = meta[:capture] do
+            "instead of using &#{capture}, you must define an anonymous function, define a variable and pattern match on \"%#{inspect(module)}{}\""
+          else
+            "when defining the variable \"#{Macro.to_string(map)}\", you must also pattern match on \"%#{inspect(module)}{}\""
+          end
+
+        _ ->
+          "you must assign \"#{Macro.to_string(map)}\" to variable and pattern match on \"%#{inspect(module)}{}\""
+      end
+
+    %{
+      details: %{typing_traces: traces},
+      message:
+        IO.iodata_to_binary([
+          """
+          a struct for #{inspect(module)} is expected on struct update:
+
+              #{expr_to_string(expr, collapse_structs: false) |> indent(4)}
+
+          but got type:
+
+              #{to_quoted_string(type) |> indent(4)}
+          """,
+          format_traces(traces),
+          """
+
+          #{hint()} #{suggestion}. Given pattern matching is enough to catch typing errors, \
+          you may optionally convert the struct update into a map update. For example, \
+          instead of:
+
+              user = some_fun()
+              %User{user | name: "John Doe"}
+
+          it is enough to write:
+
+              %User{} = user = some_fun()
+              %{user | name: "John Doe"}
+          """
+        ])
+    }
+  end
+
   def format_diagnostic({:badmap, type, expr, context}) do
     traces = collect_traces(expr, context)
 

lib/elixir/src/elixir_map.erl

@@ -18,7 +18,7 @@ expand_map(Meta, Args, S, E) ->
   validate_kv(Meta, EArgs, Args, E),
   {{'%{}', Meta, EArgs}, SE, EE}.
 
-expand_struct(Meta, Left, {'%{}', MapMeta, MapArgs} = Right, S, #{context := Context} = E) ->
+expand_struct(Meta, Left, {'%{}', MapMeta, MapArgs}, S, #{context := Context} = E) ->
   CleanMapArgs = delete_struct_key(Meta, MapArgs, E),
   {[ELeft, ERight], SE, EE} = elixir_expand:expand_args([Left, {'%{}', MapMeta, CleanMapArgs}], S, E),
 
@@ -29,7 +29,6 @@ expand_struct(Meta, Left, {'%{}', MapMeta, MapArgs} = Right, S, #{context := Con
           %% The update syntax for structs is deprecated,
           %% so we return only the update syntax downstream.
           %% TODO: Remove me on Elixir v2.0
-          file_warn(MapMeta, ?key(E, file), ?MODULE, {deprecated_update, ELeft, Right}),
           _ = load_struct_info(Meta, ELeft, Assocs, EE),
           {{'%', Meta, [ELeft, ERight]}, SE, EE};
 
@@ -303,9 +302,4 @@ format_error({invalid_key_for_struct, Key}) ->
   io_lib:format("invalid key ~ts for struct, struct keys must be atoms, got: ",
                 ['Elixir.Macro':to_string(Key)]);
 format_error(ignored_struct_key_in_struct) ->
-  "key :__struct__ is ignored when using structs";
-format_error({deprecated_update, Struct, MapUpdate}) ->
-  io_lib:format("the struct update syntax is deprecated:\n\n~ts\n\n"
-                "Instead, prefer to pattern match on structs when the variable is first defined and "
-                "use the regular map update syntax instead:\n\n~ts\n",
-                ['Elixir.Macro':to_string({'%', [], [Struct, MapUpdate]}), 'Elixir.Macro':to_string(MapUpdate)]).
+  "key :__struct__ is ignored when using structs".

lib/elixir/test/elixir/module/types/expr_test.exs

@@ -871,6 +871,79 @@ defmodule Module.Types.ExprTest do
              """
     end
 
+    test "updating structs" do
+      # When we know the type
+      assert typecheck!([], %Date{Date.new!(1, 1, 1) | day: 31}) ==
+               dynamic(
+                 closed_map(
+                   __struct__: atom([Date]),
+                   day: integer(),
+                   calendar: term(),
+                   month: term(),
+                   year: term()
+                 )
+               )
+
+      # When we don't know the type of var
+      assert typeerror!([x], %Date{x | day: 31}) == ~l"""
+             a struct for Date is expected on struct update:
+
+                 %Date{x | day: 31}
+
+             but got type:
+
+                 dynamic()
+
+             where "x" was given the type:
+
+                 # type: dynamic()
+                 # from: types_test.ex:LINE
+                 x
+
+             hint: when defining the variable "x", you must also pattern match on "%Date{}". Given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:
+
+                 user = some_fun()
+                 %User{user | name: "John Doe"}
+
+             it is enough to write:
+
+                 %User{} = user = some_fun()
+                 %{user | name: "John Doe"}
+             """
+
+      # When we don't know the type of capture
+      assert typeerror!([], &%Date{&1 | day: 31}) =~ ~l"""
+             a struct for Date is expected on struct update:
+
+                 %Date{&1 | day: 31}
+
+             but got type:
+
+                 dynamic()
+
+             where "capture" was given the type:
+
+                 # type: dynamic()
+                 # from: types_test.ex:LINE
+                 &1
+
+             hint: instead of using &1, you must define an anonymous function, define a variable and pattern match on "%Date{}"\
+             """
+
+      # When we don't know the type of expression
+      assert typeerror!([], %Date{SomeMod.fun() | day: 31}) =~ """
+             a struct for Date is expected on struct update:
+
+                 %Date{SomeMod.fun() | day: 31}
+
+             but got type:
+
+                 dynamic()
+
+             hint: you must assign "SomeMod.fun()" to variable and pattern match on "%Date{}".\
+             """
+    end
+
     test "updating to open maps" do
       assert typecheck!(
                [key],