diff options
| author | Lukas Larsson <[email protected]> | 2017-11-20 10:06:29 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-11-20 10:06:29 +0100 |
| commit | 7de66cbf895db8650e2b3253d910869c67989b35 (patch) | |
| tree | 75dce536cf3f69215fcf7311af831c0efef57bc2 /bootstrap | |
| parent | d99803e7625e474dee40f0dfebf2b8092add0336 (diff) | |
| parent | 10912210641fe7d784c4ba6398c24504200ed339 (diff) | |
| download | otp-7de66cbf895db8650e2b3253d910869c67989b35.tar.gz otp-7de66cbf895db8650e2b3253d910869c67989b35.tar.bz2 otp-7de66cbf895db8650e2b3253d910869c67989b35.zip | |
Merge branch 'lukas/stdlib/maps_iterators/OTP-14012'
* lukas/stdlib/maps_iterators/OTP-14012:
erts: Limit size of first iterator for hashmaps
Update primary bootstrap
Update preloaded modules
erts: Remove erts_internal:maps_to_list/2
stdlib: Make io_lib and io_lib_pretty use maps iterator
erts: Implement batching maps:iterator
erts: Implement maps path iterator
erts: Implement map iterator using a stack
stdlib: Introduce maps iterator API
Conflicts:
bootstrap/lib/stdlib/ebin/io_lib.beam
bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
erts/emulator/beam/bif.tab
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/zlib.beam
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/lib/compiler/ebin/compiler.appup | 2 | ||||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/dist_util.beam | bin | 12200 -> 12200 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/net_kernel.beam | bin | 24228 -> 25652 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/io_lib.beam | bin | 11940 -> 12080 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/io_lib_pretty.beam | bin | 17140 -> 17292 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/maps.beam | bin | 2864 -> 3464 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/supervisor.beam | bin | 22208 -> 21968 bytes |
7 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/compiler/ebin/compiler.appup b/bootstrap/lib/compiler/ebin/compiler.appup index 277b35faa8..2973178217 100644 --- a/bootstrap/lib/compiler/ebin/compiler.appup +++ b/bootstrap/lib/compiler/ebin/compiler.appup @@ -16,7 +16,7 @@ %% limitations under the License. %% %% %CopyrightEnd% -{"7.1.1", +{"7.1.3", [{<<".*">>,[{restart_application, compiler}]}], [{<<".*">>,[{restart_application, compiler}]}] }. diff --git a/bootstrap/lib/kernel/ebin/dist_util.beam b/bootstrap/lib/kernel/ebin/dist_util.beam Binary files differindex fd4e4fb5de..27bda597d5 100644 --- a/bootstrap/lib/kernel/ebin/dist_util.beam +++ b/bootstrap/lib/kernel/ebin/dist_util.beam diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam Binary files differindex 3d59085f05..f4dd56e87e 100644 --- a/bootstrap/lib/kernel/ebin/net_kernel.beam +++ b/bootstrap/lib/kernel/ebin/net_kernel.beam diff --git a/bootstrap/lib/stdlib/ebin/io_lib.beam b/bootstrap/lib/stdlib/ebin/io_lib.beam Binary files differindex 3884967cba..5942331d8d 100644 --- a/bootstrap/lib/stdlib/ebin/io_lib.beam +++ b/bootstrap/lib/stdlib/ebin/io_lib.beam diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam Binary files differindex 183e5b6278..ffda8dcb5b 100644 --- a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam +++ b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam diff --git a/bootstrap/lib/stdlib/ebin/maps.beam b/bootstrap/lib/stdlib/ebin/maps.beam Binary files differindex f07f4f922d..50678db509 100644 --- a/bootstrap/lib/stdlib/ebin/maps.beam +++ b/bootstrap/lib/stdlib/ebin/maps.beam diff --git a/bootstrap/lib/stdlib/ebin/supervisor.beam b/bootstrap/lib/stdlib/ebin/supervisor.beam Binary files differindex f7f11b9b26..bd80784a4b 100644 --- a/bootstrap/lib/stdlib/ebin/supervisor.beam +++ b/bootstrap/lib/stdlib/ebin/supervisor.beam |