Browse Source

Merge pull request #283 from fishcakez/dial_warns

Fix some dialyzer warnings
pull/303/head
Fred Hebert 10 years ago
parent
commit
9311d9087c
7 changed files with 7 additions and 8 deletions
  1. +1
    -1
      src/rebar_app_info.erl
  2. +1
    -1
      src/rebar_prv_deps.erl
  3. +0
    -1
      src/rebar_prv_erlydtl_compiler.erl
  4. +1
    -1
      src/rebar_prv_escriptize.erl
  5. +2
    -2
      src/rebar_prv_install_deps.erl
  6. +1
    -1
      src/rebar_prv_xref.erl
  7. +1
    -1
      src/rebar_state.erl

+ 1
- 1
src/rebar_app_info.erl View File

@ -49,7 +49,7 @@
app_details=[] :: list(), app_details=[] :: list(),
applications=[] :: list(), applications=[] :: list(),
deps=[] :: list(), deps=[] :: list(),
profiles=[default] :: atom(),
profiles=[default] :: [atom()],
dep_level=0 :: integer(), dep_level=0 :: integer(),
dir :: file:name(), dir :: file:name(),
out_dir :: file:name(), out_dir :: file:name(),

+ 1
- 1
src/rebar_prv_deps.erl View File

@ -74,7 +74,7 @@ display_dep(_State, {Name, _Vsn, Source}) when is_tuple(Source) ->
display_dep(_State, {Name, _Vsn, Source, _Opts}) when is_tuple(Source) -> display_dep(_State, {Name, _Vsn, Source, _Opts}) when is_tuple(Source) ->
?CONSOLE("~s* (source ~p)", [ec_cnv:to_binary(Name), Source]); ?CONSOLE("~s* (source ~p)", [ec_cnv:to_binary(Name), Source]);
%% Locked %% Locked
display_dep(State, {Name, Source={pkg, _, Vsn, _}, Level}) when is_integer(Level) ->
display_dep(State, {Name, Source={pkg, _, Vsn}, Level}) when is_integer(Level) ->
DepsDir = rebar_dir:deps_dir(State), DepsDir = rebar_dir:deps_dir(State),
AppDir = filename:join([DepsDir, ec_cnv:to_binary(Name)]), AppDir = filename:join([DepsDir, ec_cnv:to_binary(Name)]),
NeedsUpdate = case rebar_fetch:needs_update(AppDir, Source) of NeedsUpdate = case rebar_fetch:needs_update(AppDir, Source) of

+ 0
- 1
src/rebar_prv_erlydtl_compiler.erl View File

@ -173,7 +173,6 @@ option(Opt, DtlOpts) ->
default(app) -> undefined; default(app) -> undefined;
default(doc_root) -> "priv/templates"; default(doc_root) -> "priv/templates";
default(out_dir) -> "ebin";
default(source_ext) -> ".dtl"; default(source_ext) -> ".dtl";
default(module_ext) -> "_dtl"; default(module_ext) -> "_dtl";
default(custom_tags_dir) -> ""; default(custom_tags_dir) -> "";

+ 1
- 1
src/rebar_prv_escriptize.erl View File

@ -69,7 +69,7 @@ escriptize(State0) ->
[App] -> [App] ->
App; App;
Apps -> Apps ->
case rebar_state:get(escript_main_app, State0, undefined) of
case rebar_state:get(State0, escript_main_app, undefined) of
undefined -> undefined ->
?PRV_ERROR(no_main_app); ?PRV_ERROR(no_main_app);
Name -> Name ->

+ 2
- 2
src/rebar_prv_install_deps.erl View File

@ -346,7 +346,7 @@ handle_dep(AppInfo, SrcDeps, PkgDeps, SrcApps, Level, State, Locks) ->
,NewLocks}. ,NewLocks}.
-spec handle_dep(rebar_state:t(), file:filename_all(), rebar_app_info:t(), list(), integer()) -> -spec handle_dep(rebar_state:t(), file:filename_all(), rebar_app_info:t(), list(), integer()) ->
{rebar_app_info:t(), [rebar_app_info:t()], [pkg_dep()]}.
{rebar_app_info:t(), [rebar_app_info:t()], [pkg_dep()], [integer()]}.
handle_dep(State, DepsDir, AppInfo, Locks, Level) -> handle_dep(State, DepsDir, AppInfo, Locks, Level) ->
Profiles = rebar_state:current_profiles(State), Profiles = rebar_state:current_profiles(State),
Name = rebar_app_info:name(AppInfo), Name = rebar_app_info:name(AppInfo),
@ -402,7 +402,7 @@ in_default(AppInfo, State) ->
DefaultAppDir = filename:join([rebar_state:get(State, base_dir), "default", "lib", Name]), DefaultAppDir = filename:join([rebar_state:get(State, base_dir), "default", "lib", Name]),
rebar_app_discover:find_app(DefaultAppDir, all). rebar_app_discover:find_app(DefaultAppDir, all).
-spec parse_deps(binary(), list(), list(), list(), integer()) -> {[rebar_app_info:t()], [pkg_dep()]}.
-spec parse_deps(binary(), list(), rebar_state:t(), list(), integer()) -> {[rebar_app_info:t()], [pkg_dep()]}.
parse_deps(DepsDir, Deps, State, Locks, Level) -> parse_deps(DepsDir, Deps, State, Locks, Level) ->
lists:foldl(fun(Dep, Acc) -> lists:foldl(fun(Dep, Acc) ->
Name = case Dep of Name = case Dep of

+ 1
- 1
src/rebar_prv_xref.erl View File

@ -88,7 +88,7 @@ desc() ->
" - (\"mod\":\".*foo\"/\"4\"))",[]}]} " - (\"mod\":\".*foo\"/\"4\"))",[]}]}
]). ]).
-spec prepare(rebar_state:t()) -> list(atom()).
-spec prepare(rebar_state:t()) -> {[file:filename()], [atom()]}.
prepare(State) -> prepare(State) ->
{ok, _} = xref:start(xref), {ok, _} = xref:start(xref),
ok = xref:set_library_path(xref, code_path(State)), ok = xref:set_library_path(xref, code_path(State)),

+ 1
- 1
src/rebar_state.erl View File

@ -41,7 +41,7 @@
lock = [], lock = [],
current_profiles = [default] :: [atom()], current_profiles = [default] :: [atom()],
namespace = undefined :: [atom()],
namespace = undefined :: atom(),
command_args = [], command_args = [],
command_parsed_args = [], command_parsed_args = [],

Loading…
Cancel
Save