Remove ambiguous type wording from protocol errors

Author: josevalim

lib/elixir/lib/exception.ex

@@ -2003,7 +2003,7 @@ defmodule Protocol.UndefinedError do
       # Indent only lines with contents on them
       |> String.replace(~r/^(?=.+)/m, "    ")
 
-    "protocol #{inspect(protocol)} not implemented for type " <>
+    "protocol #{inspect(protocol)} not implemented for " <>
       value_type(value) <>
       maybe_description(description) <>
       maybe_available(protocol) <>
@@ -2038,7 +2038,7 @@ defmodule Protocol.UndefinedError do
         ". There are no implementations for this protocol."
 
       {:consolidated, types} ->
-        ". This protocol is implemented for the following type(s): " <>
+        ". This protocol is implemented for: " <>
           Enum.map_join(types, ", ", &inspect/1)
 
       :not_consolidated ->

lib/elixir/lib/kernel.ex

@@ -5382,7 +5382,7 @@ defmodule Kernel do
 
       john = %User{name: "John"}
       MyProtocol.call(john)
-      ** (Protocol.UndefinedError) protocol MyProtocol not implemented for %User{...}
+      ** (Protocol.UndefinedError) protocol MyProtocol not implemented for User (a struct)
 
   `defstruct/1`, however, allows protocol implementations to be
   *derived*. This can be done by defining a `@derive` attribute as a

lib/elixir/test/elixir/inspect_test.exs

@@ -526,7 +526,7 @@ defmodule Inspect.MapTest do
     # Inspect.Error is raised here when we tried to print the error message
     # called by another exception (Protocol.UndefinedError in this case)
     exception_message = ~s'''
-    protocol Enumerable not implemented for type Inspect.MapTest.Failing (a struct)
+    protocol Enumerable not implemented for Inspect.MapTest.Failing (a struct)
 
     Got value:
 
@@ -930,7 +930,7 @@ defmodule Inspect.CustomProtocolTest do
     got Protocol.UndefinedError with message:
 
         """
-        protocol Inspect.CustomProtocolTest.CustomInspect not implemented for type Inspect.CustomProtocolTest.MissingImplementation (a struct)
+        protocol Inspect.CustomProtocolTest.CustomInspect not implemented for Inspect.CustomProtocolTest.MissingImplementation (a struct)
 
         Got value:
 
@@ -961,7 +961,7 @@ defmodule Inspect.CustomProtocolTest do
       got Protocol.UndefinedError with message:
 
           """
-          protocol Inspect.CustomProtocolTest.CustomInspect not implemented for type Inspect.CustomProtocolTest.MissingImplementation (a struct)
+          protocol Inspect.CustomProtocolTest.CustomInspect not implemented for Inspect.CustomProtocolTest.MissingImplementation (a struct)
 
           Got value:
 

lib/elixir/test/elixir/protocol/consolidation_test.exs

@@ -182,8 +182,8 @@ defmodule Protocol.ConsolidationTest do
 
   test "protocol not implemented" do
     message =
-      "protocol Protocol.ConsolidationTest.Sample not implemented for type Atom. " <>
-        "This protocol is implemented for the following type(s): Protocol.ConsolidationTest.ImplStruct" <>
+      "protocol Protocol.ConsolidationTest.Sample not implemented for Atom. " <>
+        "This protocol is implemented for: Protocol.ConsolidationTest.ImplStruct" <>
         "\n\nGot value:\n\n    :foo\n"
 
     assert_raise Protocol.UndefinedError, message, fn ->

lib/elixir/test/elixir/protocol_test.exs

@@ -120,7 +120,7 @@ defmodule ProtocolTest do
   test "protocol not implemented" do
     message =
       """
-      protocol ProtocolTest.Sample not implemented for type Atom
+      protocol ProtocolTest.Sample not implemented for Atom
 
       Got value:
 
@@ -289,7 +289,7 @@ defmodule ProtocolTest do
     assert Derivable.ok(struct) == {:ok, struct, %ImplStruct{}, []}
 
     assert_raise Protocol.UndefinedError,
-                 ~r"protocol ProtocolTest.Derivable not implemented for type ProtocolTest.NoImplStruct \(a struct\), you should try harder",
+                 ~r"protocol ProtocolTest.Derivable not implemented for ProtocolTest.NoImplStruct \(a struct\), you should try harder",
                  fn ->
                    struct = %NoImplStruct{a: 1, b: 1}
                    Derivable.ok(struct)

lib/elixir/test/elixir/string/chars_test.exs

@@ -106,7 +106,7 @@ defmodule String.Chars.ErrorsTest do
   test "bitstring" do
     message =
       """
-      protocol String.Chars not implemented for type BitString, cannot convert a bitstring to a string
+      protocol String.Chars not implemented for BitString, cannot convert a bitstring to a string
 
       Got value:
 
@@ -120,7 +120,7 @@ defmodule String.Chars.ErrorsTest do
 
   test "tuple" do
     message = """
-    protocol String.Chars not implemented for type Tuple
+    protocol String.Chars not implemented for Tuple
 
     Got value:
 
@@ -134,7 +134,7 @@ defmodule String.Chars.ErrorsTest do
 
   test "PID" do
     message =
-      ~r"^protocol String\.Chars not implemented for type PID\n\nGot value:\n\n    #PID<.+?>$"
+      ~r"^protocol String\.Chars not implemented for PID\n\nGot value:\n\n    #PID<.+?>$"
 
     assert_raise Protocol.UndefinedError, message, fn ->
       to_string(self())
@@ -143,7 +143,7 @@ defmodule String.Chars.ErrorsTest do
 
   test "ref" do
     message =
-      ~r"^protocol String\.Chars not implemented for type Reference\n\nGot value:\n\n    #Reference<.+?>$"
+      ~r"^protocol String\.Chars not implemented for Reference\n\nGot value:\n\n    #Reference<.+?>$"
 
     assert_raise Protocol.UndefinedError, message, fn ->
       to_string(make_ref()) == ""
@@ -152,7 +152,7 @@ defmodule String.Chars.ErrorsTest do
 
   test "function" do
     message =
-      ~r"^protocol String\.Chars not implemented for type Function\n\nGot value:\n\n    #Function<.+?>$"
+      ~r"^protocol String\.Chars not implemented for Function\n\nGot value:\n\n    #Function<.+?>$"
 
     assert_raise Protocol.UndefinedError, message, fn ->
       to_string(fn -> nil end)
@@ -163,7 +163,7 @@ defmodule String.Chars.ErrorsTest do
     [port | _] = Port.list()
 
     message =
-      ~r"^protocol String\.Chars not implemented for type Port\n\nGot value:\n\n    #Port<.+?>$"
+      ~r"^protocol String\.Chars not implemented for Port\n\nGot value:\n\n    #Port<.+?>$"
 
     assert_raise Protocol.UndefinedError, message, fn ->
       to_string(port)
@@ -172,7 +172,7 @@ defmodule String.Chars.ErrorsTest do
 
   test "user-defined struct" do
     message =
-      "protocol String\.Chars not implemented for type String.Chars.ErrorsTest.Foo (a struct)\n\nGot value:\n\n    %String.Chars.ErrorsTest.Foo{foo: \"bar\"}\n"
+      "protocol String\.Chars not implemented for String.Chars.ErrorsTest.Foo (a struct)\n\nGot value:\n\n    %String.Chars.ErrorsTest.Foo{foo: \"bar\"}\n"
 
     assert_raise Protocol.UndefinedError, message, fn ->
       to_string(%Foo{})