Remove support for old OTP versions

Author: kuenishi

include/msgpack.hrl

@@ -84,13 +84,6 @@
           original_list = []       :: msgpack_list_options()
          }).
 
--ifdef(without_map).
-
--define(OPTION, #options_v2).
--type msgpack_option() :: #options_v2{}.
-
--else.
-
 -record(options_v3, {
           interface = ?DEFAULT_MAP_FORMAT :: format_type(),
           map_unpack_fun = ?DEFAULT_MAP_UNPACKER_FUN :: msgpack_map_unpacker(),
@@ -104,6 +97,3 @@
 
 -define(OPTION, #options_v3).
 -type msgpack_option() :: #options_v3{}.
-
--endif.
-

rebar.config

@@ -1,4 +1,4 @@
-{require_otp_vsn, "R15|R16|17|18"}.
+{require_otp_vsn, "17|18"}.
 
 {erl_opts, [fail_on_warning, debug_info, warn_untyped_record]}.
 {xref_checks, [undefined_function_calls]}.

src/msgpack_packer.erl

@@ -85,33 +85,6 @@ pack(List, Opt)  when is_list(List) ->
 pack(Other, Opt) ->
     handle_ext(Other, Opt).
 
--ifdef(without_map).
-
-%% TODO: maybe we don't need this inside ifdef
-%%       as to use ?OPTION{enable_str=boolean()}
-handle_binary(Bin, Opt) ->
-    case Opt of
-        #options_v2{enable_str=true} = Opt -> pack_raw2(Bin);
-        #options_v2{enable_str=false} = Opt -> pack_raw(Bin);
-        #options_v1{} = Opt -> pack_raw(Bin)
-    end.
-
-%% Packing ext type with user defined packer function
-handle_ext(Any, _Opt = ?OPTION{ext_packer=Packer,
-                         original_list=Orig,
-                         interface=Interface})
-  when is_function(Packer) andalso Interface =/= map ->
-
-    case pack_ext(Any, Packer, Orig) of
-        {ok, Binary} -> Binary;
-        {error, E} -> throw({error, E})
-    end;
-
-handle_ext(Other, _) ->
-    throw({badarg, Other}).
-
--else.
-
 handle_binary(Bin, Opt) ->
     case Opt of
         #options_v3{enable_str=true} = Opt -> pack_raw2(Bin);
@@ -137,8 +110,6 @@ handle_ext(Any, _Opt = ?OPTION{ext_packer=Packer,
 handle_ext(Other, _) ->
     throw({badarg, Other}).
 
--endif.
-
 -spec pack_int(integer()) -> binary().
 %% negative fixnum
 pack_int(N) when N >= -32->

src/msgpack_unpacker.erl

@@ -24,11 +24,7 @@
 -include_lib("eunit/include/eunit.hrl").
 
 
--ifndef(without_map).         
--export([unpack_map/3]).
--endif.
-
--export([unpack_map_jiffy/3, unpack_map_jsx/3]).
+-export([unpack_map/3, unpack_map_jiffy/3, unpack_map_jsx/3]).
 
 %% unpack them all
 -spec unpack_stream(Bin::binary(), msgpack_option()) -> {msgpack:object(), binary()} | no_return().
@@ -175,36 +171,25 @@ unpack_array(Bin, Len, Acc, Opt) ->
     {Term, Rest} = unpack_stream(Bin, Opt),
     unpack_array(Rest, Len-1, [Term|Acc], Opt).
 
--ifdef(without_map).
-map_unpacker(jiffy) ->
-    fun ?MODULE:unpack_map_jiffy/3;
-map_unpacker(jsx) ->
-    fun ?MODULE:unpack_map_jsx/3.
--else.
 map_unpacker(map) ->
     fun ?MODULE:unpack_map/3;
 map_unpacker(jiffy) ->
     fun ?MODULE:unpack_map_jiffy/3;
 map_unpacker(jsx) ->
     fun ?MODULE:unpack_map_jsx/3.
--endif.
-
-
 
--ifndef(without_map).
 -spec unpack_map(binary(), non_neg_integer(), msgpack_option()) ->
                         {map(), binary()} | no_return().
 unpack_map(Bin, Len, Opt) ->
+    %% TODO: optimize with unpack_map/4
     {Map, Rest} = unpack_map_as_proplist(Bin, Len, [], Opt),
     {maps:from_list(Map), Rest}.
-%%     unpack_map(Bin, Len, #{}, Opt).
 
 %% unpack_map(Bin, Len, Acc, _) -> {Acc, Bin};
 %% unpack_map(Bin, Len, Acc, Opt) ->
 %%     {Key, Rest} = unpack_stream(Bin, Opt),
 %%     {Value, Rest2} = unpack_stream(Rest, Opt),
 %%     unpack_map(Rest2, Len-1, maps:put(Key, Value, Acc), Opt).
--endif.
 
 %% Users SHOULD NOT send too long list: this uses lists:reverse/1
 -spec unpack_map_jiffy(binary(), non_neg_integer(), msgpack_option()) ->