Indivisible -> Broad

Author: josevalim

lib/elixir/lib/module/types/descr.ex

@@ -2371,7 +2371,7 @@ defmodule Module.Types.Descr do
 
   defp indivisible_bitmap(descr, opts) do
     with true <- Keyword.get(opts, :skip_dynamic_for_indivisible, true),
-         %{bitmap: bitmap} when map_size(descr) == 1 <- descr,
+         %{bitmap: bitmap} when map_size(descr) == 1 and bitmap != @bit_bitstring <- descr,
          [single] <- bitmap_to_quoted(bitmap) do
       single
     else

lib/elixir/pages/cheatsheets/types-cheat.cheatmd

@@ -33,7 +33,7 @@ not type
 
 ## Data types
 
-### Indivisible types
+### Broad types
 
 ```elixir
 bitstring()

lib/elixir/pages/references/gradual-set-theoretic-types.md

@@ -55,11 +55,13 @@ You can find a complete reference in the [set-theoretic types cheatsheet](../che
 
 In this section we will cover the syntax of all data types. At the moment, developers will interact with those types mostly through compiler warnings and diagnostics.
 
-### Indivisible types
+### Broad types
 
-These types are indivisibile and have no further representation. They are: `binary()`, `bitstring()`, `integer()`, `float()`, `pid()`, `port()`, `reference()`.  For example, the numbers `1` and `42` are both represented by the type `integer()`.
+These types are broad in that they cannot represent individual elements, only the whole set. For example, the numbers `1` and `42` are both represented by the type `integer()`.
 
-Note the `binary()` type is a subtype of the less frequently used `bitstring()` type, as binaries are bitstrings where the number of bits is divisible by 8.
+They are: `binary()`, `bitstring()`, `integer()`, `float()`, `pid()`, `port()`, `reference()`.
+
+The `binary()` type is a subtype of the less frequently used `bitstring()` type, as binaries are bitstrings where the number of bits is divisible by 8.
 
 ### Atoms
 

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

@@ -2528,16 +2528,23 @@ defmodule Module.Types.DescrTest do
     test "dynamic" do
       assert dynamic() |> to_quoted_string() == "dynamic()"
 
+      assert intersection(atom(), dynamic()) |> to_quoted_string() == "dynamic(atom())"
+
       assert dynamic(union(atom(), integer())) |> union(integer()) |> to_quoted_string() ==
                "dynamic(atom()) or integer()"
 
-      assert intersection(binary(), dynamic()) |> to_quoted_string() == "binary()"
+      assert intersection(binary(), dynamic()) |> to_quoted_string() ==
+               "binary()"
+
+      assert intersection(bitstring(), dynamic()) |> to_quoted_string() ==
+               "dynamic(bitstring())"
+
+      assert intersection(bitstring_no_binary(), dynamic()) |> to_quoted_string() ==
+               "bitstring() and not binary()"
 
       assert intersection(union(binary(), pid()), dynamic()) |> to_quoted_string() ==
                "dynamic(binary() or pid())"
 
-      assert intersection(atom(), dynamic()) |> to_quoted_string() == "dynamic(atom())"
-
       assert union(atom([:foo, :bar]), dynamic()) |> to_quoted_string() ==
                "dynamic() or :bar or :foo"