summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-04-11 17:14:11 -0500
committerTristan Sloughter <t@crashfast.com>2015-04-11 17:17:03 -0500
commitd317869a3e3234510d3b2edc756caeff4cc1d515 (patch)
tree6a4d29ad135eeadae218de58cc762a189f27d699
parentef22eeb387d08548e971a5698d01924ef12b6095 (diff)
clean ups from Fred's comments
-rw-r--r--src/rebar.hrl6
-rw-r--r--src/rebar_config.erl4
-rw-r--r--src/rebar_digraph.erl2
-rw-r--r--src/rebar_state.erl2
4 files changed, 4 insertions, 10 deletions
diff --git a/src/rebar.hrl b/src/rebar.hrl
index 593738e..1f051d7 100644
--- a/src/rebar.hrl
+++ b/src/rebar.hrl
@@ -36,12 +36,6 @@
-type rebar_digraph() :: digraph().
-endif.
--ifdef(namespaced_types).
--type rebar_tid() :: ets:tid().
--else.
--type rebar_tid() :: tid().
--endif.
-
-define(GRAPH_VSN, 2).
-type v() :: {digraph:vertex(), term()} | 'false'.
-type e() :: {digraph:vertex(), digraph:vertex()}.
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 5048ba3..76e03ea 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -128,8 +128,8 @@ check_newly_added(Dep, LockedDeps) when is_atom(Dep) ->
true;
_ ->
?WARN("Newly added dep ~s is locked at a lower level. "
- "If you really want to unlock it, use 'rebar3 upgrade ~s'",
- [NewDep, NewDep]),
+ "If you really want to unlock it, use 'rebar3 upgrade ~s'",
+ [NewDep, NewDep]),
false
end
end;
diff --git a/src/rebar_digraph.erl b/src/rebar_digraph.erl
index 35fd7e7..7c1fe90 100644
--- a/src/rebar_digraph.erl
+++ b/src/rebar_digraph.erl
@@ -101,7 +101,7 @@ cull_deps(Graph, Vertices, Level, Levels, Solution, Discarded) ->
DiscardedAcc1}
end
end, {NewVertices, SolutionAcc, LevelsAcc, DiscardedAcc}, OutNeighbors)
- end, {[], Solution, Levels, Discarded}, lists:sort(Vertices)),
+ end, {[], Solution, Levels, Discarded}, lists:keysort(1, Vertices)),
cull_deps(Graph, NV, Level+1, LS, NS, DS).
subgraph(Graph, Vertices) ->
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 3e45ba8..f922977 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -55,7 +55,7 @@
all_deps = [] :: [rebar_app_info:t()],
packages = undefined :: {rebar_dict(), rebar_digraph()} | undefined,
- registry = undefined :: {ok, rebar_tid()} | error | undefined,
+ registry = undefined :: {ok, ets:tid()} | error | undefined,
overrides = [],
resources = [],
providers = []}).