diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-06-28 15:26:41 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-06-28 16:02:00 +0200 |
| commit | fa20bbcc482e3bd09678351191ee9a296113b3dc (patch) | |
| tree | 48f231deb1eb3d8a1396cf12c21821942b464382 /src/dtree.erl | |
| parent | d27a16388d28e753120f30b047ab64077abb9f88 (diff) | |
| download | rabbitmq-server-git-fa20bbcc482e3bd09678351191ee9a296113b3dc.tar.gz | |
Use the new -spec format
The old format is removed in Erlang 19.0, leading to build errors.
Also, get rid of the `use_specs` macro and thus always define -spec() &
friends.
While here, unnify the style of -type and -spec.
References #860.
[#118562897]
[#122335241]
Diffstat (limited to 'src/dtree.erl')
| -rw-r--r-- | src/dtree.erl | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/dtree.erl b/src/dtree.erl index 99133e75b6..a2232c0687 100644 --- a/src/dtree.erl +++ b/src/dtree.erl @@ -37,29 +37,25 @@ %%---------------------------------------------------------------------------- --ifdef(use_specs). - -export_type([?MODULE/0]). --opaque(?MODULE() :: {gb_trees:tree(), gb_trees:tree()}). - --type(pk() :: any()). --type(sk() :: any()). --type(val() :: any()). --type(kv() :: {pk(), val()}). - --spec(empty/0 :: () -> ?MODULE()). --spec(insert/4 :: (pk(), [sk()], val(), ?MODULE()) -> ?MODULE()). --spec(take/3 :: ([pk()], sk(), ?MODULE()) -> {[kv()], ?MODULE()}). --spec(take/2 :: (sk(), ?MODULE()) -> {[kv()], ?MODULE()}). --spec(take_all/2 :: (sk(), ?MODULE()) -> {[kv()], ?MODULE()}). --spec(drop/2 :: (pk(), ?MODULE()) -> ?MODULE()). --spec(is_defined/2 :: (sk(), ?MODULE()) -> boolean()). --spec(is_empty/1 :: (?MODULE()) -> boolean()). --spec(smallest/1 :: (?MODULE()) -> kv()). --spec(size/1 :: (?MODULE()) -> non_neg_integer()). - --endif. +-opaque ?MODULE() :: {gb_trees:tree(), gb_trees:tree()}. + +-type pk() :: any(). +-type sk() :: any(). +-type val() :: any(). +-type kv() :: {pk(), val()}. + +-spec empty() -> ?MODULE(). +-spec insert(pk(), [sk()], val(), ?MODULE()) -> ?MODULE(). +-spec take([pk()], sk(), ?MODULE()) -> {[kv()], ?MODULE()}. +-spec take(sk(), ?MODULE()) -> {[kv()], ?MODULE()}. +-spec take_all(sk(), ?MODULE()) -> {[kv()], ?MODULE()}. +-spec drop(pk(), ?MODULE()) -> ?MODULE(). +-spec is_defined(sk(), ?MODULE()) -> boolean(). +-spec is_empty(?MODULE()) -> boolean(). +-spec smallest(?MODULE()) -> kv(). +-spec size(?MODULE()) -> non_neg_integer(). %%---------------------------------------------------------------------------- |