diff options
| author | Tristan Sloughter <t@crashfast.com> | 2014-10-18 13:00:18 -0500 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2014-10-18 13:00:18 -0500 |
| commit | 21cf46ff9ce8b7748b46d2562259791e20797597 (patch) | |
| tree | 6f0f49a4184b682b7a8fcdaf09975f88499aed81 /src/rebar_topo.erl | |
| parent | 2930eb480deba84fbc3d5408c6134a68411a4651 (diff) | |
dialyzer fixes
Diffstat (limited to 'src/rebar_topo.erl')
| -rw-r--r-- | src/rebar_topo.erl | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/rebar_topo.erl b/src/rebar_topo.erl index e4a3e26..26ebbc4 100644 --- a/src/rebar_topo.erl +++ b/src/rebar_topo.erl @@ -94,7 +94,7 @@ names_to_apps(Names, Apps) -> -spec find_app_by_name(atom(), [rebar_app_info:t()]) -> {ok, rebar_app_info:t()} | error. find_app_by_name(Name, Apps) -> ec_lists:find(fun(App) -> - rebar_app_info:name(App) =:= Name + ec_cnv:to_atom(rebar_app_info:name(App)) =:= ec_cnv:to_atom(Name) end, Apps). -spec apps_to_pairs([rebar_app_info:t()]) -> [pair()]. @@ -103,20 +103,20 @@ apps_to_pairs(Apps) -> -spec app_to_pairs(rebar_app_info:t()) -> [pair()]. app_to_pairs(App) -> - [{ec_cnv:to_binary(DepApp), rebar_app_info:name(App)} || + [{ec_cnv:to_atom(DepApp), ec_cnv:to_atom(rebar_app_info:name(App))} || DepApp <- rebar_app_info:deps(App)]. %% @doc Iterate over the system. @private -spec iterate([pair()], [name()], [name()]) -> - {ok, [name()]} | relx:error(). + {ok, [name()]} | {error, iolist()}. iterate([], L, All) -> {ok, remove_duplicates(L ++ subtract(All, L))}; iterate(Pairs, L, All) -> case subtract(lhs(Pairs), rhs(Pairs)) of [] -> - format_error({cycle, Pairs}); + {error, format_error({cycle, Pairs})}; Lhs -> iterate(remove_pairs(Lhs, Pairs), L ++ Lhs, All) end. @@ -186,15 +186,13 @@ topo_2_test() -> topo_pairs_cycle_test() -> Pairs = [{app2, app1}, {app1, app2}, {stdlib, app1}], - ?assertMatch({error, {_, {cycle, [{app2, app1}, {app1, app2}]}}}, - sort(Pairs)). + ?assertMatch({error, _}, sort(Pairs)). topo_apps_cycle_test() -> {ok, App1} = rebar_app_info:new(app1, "0.1", "/no-dir", [app2]), {ok, App2} = rebar_app_info:new(app2, "0.1", "/no-dir", [app1]), Apps = [App1, App2], - ?assertMatch({error, {_, {cycle, [{app2,app1},{app1,app2}]}}}, - sort_apps(Apps)). + ?assertMatch({error, _}, sort_apps(Apps)). topo_apps_good_test() -> Apps = [App || |