浏览代码

fix namespaced types for pre-17 otp

pull/3/head
Tristan Sloughter 10 年前
父节点
当前提交
6efdd8cbfe
共有 3 个文件被更改,包括 8 次插入2 次删除
  1. +6
    -0
      include/rebar.hrl
  2. +1
    -1
      src/rebar_packages.erl
  3. +1
    -1
      src/rebar_prv_install_deps.erl

+ 6
- 0
include/rebar.hrl 查看文件

@ -27,3 +27,9 @@
-define(DEFAULT_PLUGINS_DIR, "_plugins"). -define(DEFAULT_PLUGINS_DIR, "_plugins").
-define(DEFAULT_CONFIG_FILE, "rebar.config"). -define(DEFAULT_CONFIG_FILE, "rebar.config").
-define(LOCK_FILE, "rebar.lock"). -define(LOCK_FILE, "rebar.lock").
-ifdef(namespaced_types).
-type rebar_dict() :: dict:dict().
-else.
-type rebar_dict() :: dict().
-endif.

+ 1
- 1
src/rebar_packages.erl 查看文件

@ -4,7 +4,7 @@
-include("rebar.hrl"). -include("rebar.hrl").
-spec get_packages(rebar_state:t()) -> {dict:dict(), tuple()}.
-spec get_packages(rebar_state:t()) -> {rebar_dict(), tuple()}.
get_packages(State) -> get_packages(State) ->
RebarDir = rebar_state:get(State, global_rebar_dir, filename:join(os:getenv("HOME"), ".rebar")), RebarDir = rebar_state:get(State, global_rebar_dir, filename:join(os:getenv("HOME"), ".rebar")),
PackagesFile = filename:join(RebarDir, "packages"), PackagesFile = filename:join(RebarDir, "packages"),

+ 1
- 1
src/rebar_prv_install_deps.erl 查看文件

@ -140,7 +140,7 @@ handle_deps(State, Deps, Update) ->
is_valid(App) -> is_valid(App) ->
rebar_app_info:valid(App). rebar_app_info:valid(App).
-spec package_to_app(file:filename_all(), dict:dict(),
-spec package_to_app(file:filename_all(), rebar_dict(),
rlx_depsolver:pkg()) -> rebar_app_info:t(). rlx_depsolver:pkg()) -> rebar_app_info:t().
package_to_app(DepsDir, Packages, Pkg={_, Vsn}) -> package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)), Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)),

正在加载...
取消
保存