Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'minor-fixes' of https://github.com/tuncer/rebar into tu…

…ncer-minor-fixes
  • Loading branch information...
commit 8b6a2a8c74c75a2bb2fa45567b1e16ee5aee8658 2 parents 353af1c + 15373a5
@ferd ferd authored
View
9 bootstrap
@@ -36,10 +36,11 @@ main(Args) ->
%% Extract the system info of the version of OTP we use to compile rebar
OtpInfo = string:strip(erlang:system_info(otp_release), both, $\n),
- %% Types dict:dict() and digraph:digraph() have been introduced in Erlang 17.
- %% At the same time, their counterparts dict() and digraph() are to be deprecated
- %% in Erlang 18. namespaced_types option is used to select proper type name
- %% depending of the OTP version used.
+ %% Types dict:dict() and digraph:digraph() have been introduced in
+ %% Erlang 17.
+ %% At the same time, their counterparts dict() and digraph() are to be
+ %% deprecated in Erlang 18. namespaced_types option is used to select
+ %% proper type name depending on the OTP version used.
NamespacedTypes = case is_otp(OtpInfo, "^[0-9]+") of
true -> {d, namespaced_types};
false -> undefined
View
13 rebar.config
@@ -4,11 +4,16 @@
%% escript_incl_extra is for internal rebar-private use only.
%% Do not use outside rebar. Config interface is not stable.
{escript_incl_extra, [{"priv/templates/*", "."}]}.
+
%% Types dict:dict() and digraph:digraph() have been introduced in Erlang 17.
-%% At the same time, their counterparts dict() and digraph() are to be deprecated
-%% in Erlang 18. namespaced_types option is used to select proper type name
-%% depending of the OTP version used.
-{erl_opts, [{platform_define, "^[0-9]+", namespaced_types}, warnings_as_errors]}.
+%% At the same time, their counterparts dict() and digraph() are to be
+%% deprecated in Erlang 18. namespaced_types option is used to select proper
+%% type name depending on the OTP version used.
+{erl_opts,
+ [
+ {platform_define, "^[0-9]+", namespaced_types}
+ ]}.
+
{xref_checks, []}.
{xref_queries,
[{"(XC - UC) || (XU - X - B
View
6 src/rebar_config.erl
@@ -40,10 +40,10 @@
-include("rebar.hrl").
-ifdef(namespaced_types).
-% dict:dict() exists starting from Erlang 17.
--type rebar_dict() :: dict:dict().
+%% dict:dict() exists starting from Erlang 17.
+-type rebar_dict() :: dict:dict(term(), term()).
-else.
-% dict() has been obsoleted in Erlang 17 and deprecated in 18.
+%% dict() has been obsoleted in Erlang 17 and deprecated in 18.
-type rebar_dict() :: dict().
-endif.
View
6 src/rebar_erlc_compiler.erl
@@ -48,10 +48,10 @@
}).
-ifdef(namespaced_types).
-% digraph:digraph() exists starting from Erlang 17.
--type rebar_digraph() :: digraph:digraph().
+%% digraph:graph() exists starting from Erlang 17.
+-type rebar_digraph() :: digraph:graph().
-else.
-% digraph() has been obsoleted in Erlang 17 and deprecated in 18.
+%% digraph() has been obsoleted in Erlang 17 and deprecated in 18.
-type rebar_digraph() :: digraph().
-endif.
Please sign in to comment.
Something went wrong with that request. Please try again.