Skip to content

Commit 9306b19

Browse files
michaelklishinmichaelklishin
committed
Compile on OTP 19.0
1 parent b9d7e4d commit 9306b19

File tree

77 files changed

+626
-676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+626
-676
lines changed

‎include/gm_specs.hrl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
-type(args() :: any()).
2121
-type(members() :: [pid()]).
2222

23-
-spec(joined/2 :: (args(), members()) -> callback_result()).
24-
-spec(members_changed/3 :: (args(), members(),members()) -> callback_result()).
25-
-spec(handle_msg/3 :: (args(), pid(), any()) -> callback_result()).
26-
-spec(handle_terminate/2 :: (args(), term()) -> any()).
23+
-spec(joined(args(), members()) -> callback_result()).
24+
-spec(members_changed(args(), members(),members()) -> callback_result()).
25+
-spec(handle_msg(args(), pid(), any()) -> callback_result()).
26+
-spec(handle_terminate(args(), term()) -> any()).
2727

2828
-endif.

‎src/background_gc.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
-ifdef(use_specs).
3636

37-
-spec(start_link/0 :: () -> {'ok', pid()} | {'error', any()}).
38-
-spec(run/0 :: () -> 'ok').
39-
-spec(gc/0 :: () -> 'ok').
37+
-spec(start_link() -> {'ok', pid()} | {'error', any()}).
38+
-spec(run() -> 'ok').
39+
-spec(gc() -> 'ok').
4040

4141
-endif.
4242

‎src/delegate.erl

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,17 @@
6464
-type(monitor_ref() :: reference() | {atom(), pid()}).
6565
-type(fun_or_mfa(A) :: fun ((pid()) -> A) | {atom(), atom(), [any()]}).
6666

67-
-spec(start_link/1 ::
68-
(non_neg_integer()) -> {'ok', pid()} | ignore | {'error', any()}).
69-
-spec(invoke/2 :: ( pid(), fun_or_mfa(A)) -> A;
67+
-spec(start_link(non_neg_integer()) -> {'ok', pid()} | ignore | {'error', any()}).
68+
-spec(invoke(pid(), fun_or_mfa(A)) -> A;
7069
([pid()], fun_or_mfa(A)) -> {[{pid(), A}],
7170
[{pid(), term()}]}).
72-
-spec(invoke_no_result/2 :: (pid() | [pid()], fun_or_mfa(any())) -> 'ok').
73-
-spec(monitor/2 :: ('process', pid()) -> monitor_ref()).
74-
-spec(demonitor/1 :: (monitor_ref()) -> 'true').
71+
-spec(invoke_no_result(pid() | [pid()], fun_or_mfa(any())) -> 'ok').
72+
-spec(monitor('process', pid()) -> monitor_ref()).
73+
-spec(demonitor(monitor_ref()) -> 'true').
7574

76-
-spec(call/2 ::
77-
( pid(), any()) -> any();
75+
-spec(call(pid(), any()) -> any();
7876
([pid()], any()) -> {[{pid(), any()}], [{pid(), term()}]}).
79-
-spec(cast/2 :: (pid() | [pid()], any()) -> 'ok').
77+
-spec(cast(pid() | [pid()], any()) -> 'ok').
8078

8179
-endif.
8280

‎src/delegate_sup.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
-ifdef(use_specs).
3030

31-
-spec(start_link/1 :: (integer()) -> rabbit_types:ok_pid_or_error()).
32-
-spec(count/1 :: ([node()]) -> integer()).
31+
-spec(start_link(integer()) -> rabbit_types:ok_pid_or_error()).
32+
-spec(count([node()]) -> integer()).
3333

3434
-endif.
3535

‎src/dtree.erl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
-type(val() :: any()).
4949
-type(kv() :: {pk(), val()}).
5050

51-
-spec(empty/0 :: () -> ?MODULE()).
52-
-spec(insert/4 :: (pk(), [sk()], val(), ?MODULE()) -> ?MODULE()).
53-
-spec(take/3 :: ([pk()], sk(), ?MODULE()) -> {[kv()], ?MODULE()}).
54-
-spec(take/2 :: (sk(), ?MODULE()) -> {[kv()], ?MODULE()}).
55-
-spec(take_all/2 :: (sk(), ?MODULE()) -> {[kv()], ?MODULE()}).
56-
-spec(drop/2 :: (pk(), ?MODULE()) -> ?MODULE()).
57-
-spec(is_defined/2 :: (sk(), ?MODULE()) -> boolean()).
58-
-spec(is_empty/1 :: (?MODULE()) -> boolean()).
59-
-spec(smallest/1 :: (?MODULE()) -> kv()).
60-
-spec(size/1 :: (?MODULE()) -> non_neg_integer()).
51+
-spec(empty() -> ?MODULE()).
52+
-spec(insert(pk(), [sk()], val(), ?MODULE()) -> ?MODULE()).
53+
-spec(take([pk()], sk(), ?MODULE()) -> {[kv()], ?MODULE()}).
54+
-spec(take(sk(), ?MODULE()) -> {[kv()], ?MODULE()}).
55+
-spec(take_all(sk(), ?MODULE()) -> {[kv()], ?MODULE()}).
56+
-spec(drop(pk(), ?MODULE()) -> ?MODULE()).
57+
-spec(is_defined(sk(), ?MODULE()) -> boolean()).
58+
-spec(is_empty(?MODULE()) -> boolean()).
59+
-spec(smallest(?MODULE()) -> kv()).
60+
-spec(size(?MODULE()) -> non_neg_integer()).
6161

6262
-endif.
6363

‎src/file_handle_cache.erl

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -244,46 +244,45 @@
244244
{'cur', integer()})).
245245
-type(offset() :: non_neg_integer()).
246246

247-
-spec(register_callback/3 :: (atom(), atom(), [any()]) -> 'ok').
248-
-spec(open/3 ::
249-
(file:filename(), [any()],
247+
-spec(register_callback(atom(), atom(), [any()]) -> 'ok').
248+
-spec(open(file:filename(), [any()],
250249
[{'write_buffer', (non_neg_integer() | 'infinity' | 'unbuffered')} |
251250
{'read_buffer', (non_neg_integer() | 'unbuffered')}])
252251
-> val_or_error(ref())).
253-
-spec(open_with_absolute_path/3 ::
252+
-spec(open_with_absolute_path
254253
(file:filename(), [any()],
255254
[{'write_buffer', (non_neg_integer() | 'infinity' | 'unbuffered')} |
256255
{'read_buffer', (non_neg_integer() | 'unbuffered')}])
257256
-> val_or_error(ref())).
258-
-spec(close/1 :: (ref()) -> ok_or_error()).
259-
-spec(read/2 :: (ref(), non_neg_integer()) ->
257+
-spec(close(ref()) -> ok_or_error()).
258+
-spec(read(ref(), non_neg_integer()) ->
260259
val_or_error([char()] | binary()) | 'eof').
261-
-spec(append/2 :: (ref(), iodata()) -> ok_or_error()).
262-
-spec(sync/1 :: (ref()) -> ok_or_error()).
263-
-spec(position/2 :: (ref(), position()) -> val_or_error(offset())).
264-
-spec(truncate/1 :: (ref()) -> ok_or_error()).
265-
-spec(current_virtual_offset/1 :: (ref()) -> val_or_error(offset())).
266-
-spec(current_raw_offset/1 :: (ref()) -> val_or_error(offset())).
267-
-spec(flush/1 :: (ref()) -> ok_or_error()).
268-
-spec(copy/3 :: (ref(), ref(), non_neg_integer()) ->
260+
-spec(append(ref(), iodata()) -> ok_or_error()).
261+
-spec(sync(ref()) -> ok_or_error()).
262+
-spec(position(ref(), position()) -> val_or_error(offset())).
263+
-spec(truncate(ref()) -> ok_or_error()).
264+
-spec(current_virtual_offset(ref()) -> val_or_error(offset())).
265+
-spec(current_raw_offset(ref()) -> val_or_error(offset())).
266+
-spec(flush(ref()) -> ok_or_error()).
267+
-spec(copy(ref(), ref(), non_neg_integer()) ->
269268
val_or_error(non_neg_integer())).
270-
-spec(delete/1 :: (ref()) -> ok_or_error()).
271-
-spec(clear/1 :: (ref()) -> ok_or_error()).
272-
-spec(set_maximum_since_use/1 :: (non_neg_integer()) -> 'ok').
273-
-spec(obtain/0 :: () -> 'ok').
274-
-spec(obtain/1 :: (non_neg_integer()) -> 'ok').
275-
-spec(release/0 :: () -> 'ok').
276-
-spec(release/1 :: (non_neg_integer()) -> 'ok').
277-
-spec(transfer/1 :: (pid()) -> 'ok').
278-
-spec(transfer/2 :: (pid(), non_neg_integer()) -> 'ok').
279-
-spec(with_handle/1 :: (fun(() -> A)) -> A).
280-
-spec(with_handle/2 :: (non_neg_integer(), fun(() -> A)) -> A).
281-
-spec(set_limit/1 :: (non_neg_integer()) -> 'ok').
282-
-spec(get_limit/0 :: () -> non_neg_integer()).
283-
-spec(info_keys/0 :: () -> rabbit_types:info_keys()).
284-
-spec(info/0 :: () -> rabbit_types:infos()).
285-
-spec(info/1 :: ([atom()]) -> rabbit_types:infos()).
286-
-spec(ulimit/0 :: () -> 'unknown' | non_neg_integer()).
269+
-spec(delete(ref()) -> ok_or_error()).
270+
-spec(clear(ref()) -> ok_or_error()).
271+
-spec(set_maximum_since_use(non_neg_integer()) -> 'ok').
272+
-spec(obtain() -> 'ok').
273+
-spec(obtain(non_neg_integer()) -> 'ok').
274+
-spec(release() -> 'ok').
275+
-spec(release(non_neg_integer()) -> 'ok').
276+
-spec(transfer(pid()) -> 'ok').
277+
-spec(transfer(pid(), non_neg_integer()) -> 'ok').
278+
-spec(with_handle(fun(() -> A)) -> A).
279+
-spec(with_handle(non_neg_integer(), fun(() -> A)) -> A).
280+
-spec(set_limit(non_neg_integer()) -> 'ok').
281+
-spec(get_limit() -> non_neg_integer()).
282+
-spec(info_keys() -> rabbit_types:info_keys()).
283+
-spec(info() -> rabbit_types:infos()).
284+
-spec(info([atom()]) -> rabbit_types:infos()).
285+
-spec(ulimit() -> 'unknown' | non_neg_integer()).
287286

288287
-endif.
289288

@@ -1482,7 +1481,7 @@ notify_age(CStates, AverageAge) ->
14821481
notify_age0(Clients, CStates, Required) ->
14831482
case [CState || CState <- CStates, CState#cstate.callback =/= undefined] of
14841483
[] -> ok;
1485-
Notifications -> S = random:uniform(length(Notifications)),
1484+
Notifications -> S = rand:uniform(length(Notifications)),
14861485
{L1, L2} = lists:split(S, Notifications),
14871486
notify(Clients, Required, L2 ++ L1)
14881487
end.

‎src/gatherer.erl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141

4242
-ifdef(use_specs).
4343

44-
-spec(start_link/0 :: () -> rabbit_types:ok_pid_or_error()).
45-
-spec(stop/1 :: (pid()) -> 'ok').
46-
-spec(fork/1 :: (pid()) -> 'ok').
47-
-spec(finish/1 :: (pid()) -> 'ok').
48-
-spec(in/2 :: (pid(), any()) -> 'ok').
49-
-spec(sync_in/2 :: (pid(), any()) -> 'ok').
50-
-spec(out/1 :: (pid()) -> {'value', any()} | 'empty').
44+
-spec(start_link() -> rabbit_types:ok_pid_or_error()).
45+
-spec(stop(pid()) -> 'ok').
46+
-spec(fork(pid()) -> 'ok').
47+
-spec(finish(pid()) -> 'ok').
48+
-spec(in(pid(), any()) -> 'ok').
49+
-spec(sync_in(pid(), any()) -> 'ok').
50+
-spec(out(pid()) -> {'value', any()} | 'empty').
5151

5252
-endif.
5353

‎src/gm.erl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -443,15 +443,15 @@
443443
-type(group_name() :: any()).
444444
-type(txn_fun() :: fun((fun(() -> any())) -> any())).
445445

446-
-spec(create_tables/0 :: () -> 'ok' | {'aborted', any()}).
447-
-spec(start_link/4 :: (group_name(), atom(), any(), txn_fun()) ->
446+
-spec(create_tables() -> 'ok' | {'aborted', any()}).
447+
-spec(start_link(group_name(), atom(), any(), txn_fun()) ->
448448
rabbit_types:ok_pid_or_error()).
449-
-spec(leave/1 :: (pid()) -> 'ok').
450-
-spec(broadcast/2 :: (pid(), any()) -> 'ok').
451-
-spec(confirmed_broadcast/2 :: (pid(), any()) -> 'ok').
452-
-spec(info/1 :: (pid()) -> rabbit_types:infos()).
453-
-spec(validate_members/2 :: (pid(), [pid()]) -> 'ok').
454-
-spec(forget_group/1 :: (group_name()) -> 'ok').
449+
-spec(leave(pid()) -> 'ok').
450+
-spec(broadcast(pid(), any()) -> 'ok').
451+
-spec(confirmed_broadcast(pid(), any()) -> 'ok').
452+
-spec(info(pid()) -> rabbit_types:infos()).
453+
-spec(validate_members(pid(), pid()) -> 'ok').
454+
-spec(forget_group(group_name()) -> 'ok').
455455

456456
%% The joined, members_changed and handle_msg callbacks can all return
457457
%% any of the following terms:
@@ -551,7 +551,7 @@ forget_group(GroupName) ->
551551

552552
init([GroupName, Module, Args, TxnFun]) ->
553553
put(process_name, {?MODULE, GroupName}),
554-
_ = random:seed(erlang:phash2([node()]),
554+
_ = rand:seed(erlang:phash2([node()]),
555555
time_compat:monotonic_time(),
556556
time_compat:unique_integer()),
557557
Self = make_member(GroupName),
@@ -1084,7 +1084,7 @@ join_group(Self, GroupName, #gm_group { members = Members } = Group, TxnFun) ->
10841084
prune_or_create_group(Self, GroupName, TxnFun),
10851085
TxnFun);
10861086
Alive ->
1087-
Left = lists:nth(random:uniform(length(Alive)), Alive),
1087+
Left = lists:nth(rand:uniform(length(Alive)), Alive),
10881088
Handler =
10891089
fun () ->
10901090
join_group(

‎src/lqueue.erl

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@
3333
-type(value() :: any()).
3434
-type(result() :: 'empty' | {'value', value()}).
3535

36-
-spec(new/0 :: () -> ?MODULE()).
37-
-spec(is_empty/1 :: (?MODULE()) -> boolean()).
38-
-spec(len/1 :: (?MODULE()) -> non_neg_integer()).
39-
-spec(in/2 :: (value(), ?MODULE()) -> ?MODULE()).
40-
-spec(in_r/2 :: (value(), ?MODULE()) -> ?MODULE()).
41-
-spec(out/1 :: (?MODULE()) -> {result(), ?MODULE()}).
42-
-spec(out_r/1 :: (?MODULE()) -> {result(), ?MODULE()}).
43-
-spec(join/2 :: (?MODULE(), ?MODULE()) -> ?MODULE()).
44-
-spec(foldl/3 :: (fun ((value(), B) -> B), B, ?MODULE()) -> B).
45-
-spec(foldr/3 :: (fun ((value(), B) -> B), B, ?MODULE()) -> B).
46-
-spec(from_list/1 :: ([value()]) -> ?MODULE()).
47-
-spec(to_list/1 :: (?MODULE()) -> [value()]).
48-
-spec(peek/1 :: (?MODULE()) -> result()).
49-
-spec(peek_r/1 :: (?MODULE()) -> result()).
36+
-spec(new() -> ?MODULE()).
37+
-spec(is_empty(?MODULE()) -> boolean()).
38+
-spec(len(?MODULE()) -> non_neg_integer()).
39+
-spec(in(value(), ?MODULE()) -> ?MODULE()).
40+
-spec(in_r(value(), ?MODULE()) -> ?MODULE()).
41+
-spec(out(?MODULE()) -> {result(), ?MODULE()}).
42+
-spec(out_r(?MODULE()) -> {result(), ?MODULE()}).
43+
-spec(join(?MODULE(), ?MODULE()) -> ?MODULE()).
44+
-spec(foldl(fun ((value(), B) -> B), B, ?MODULE()) -> B).
45+
-spec(foldr(fun ((value(), B) -> B), B, ?MODULE()) -> B).
46+
-spec(from_list([value()]) -> ?MODULE()).
47+
-spec(to_list(?MODULE()) -> [value()]).
48+
-spec(peek(?MODULE()) -> result()).
49+
-spec(peek_r(?MODULE()) -> result()).
5050

5151
-endif.
5252

‎src/mnesia_sync.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
-ifdef(use_specs).
3838

39-
-spec(sync/0 :: () -> 'ok').
39+
-spec(sync() -> 'ok').
4040

4141
-endif.
4242

‎src/pg_local.erl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545

4646
-type(name() :: term()).
4747

48-
-spec(start_link/0 :: () -> {'ok', pid()} | {'error', any()}).
49-
-spec(start/0 :: () -> {'ok', pid()} | {'error', any()}).
50-
-spec(join/2 :: (name(), pid()) -> 'ok').
51-
-spec(leave/2 :: (name(), pid()) -> 'ok').
52-
-spec(get_members/1 :: (name()) -> [pid()]).
53-
-spec(in_group/2 :: (name(), pid()) -> boolean()).
54-
55-
-spec(sync/0 :: () -> 'ok').
48+
-spec(start_link() -> {'ok', pid()} | {'error', any()}).
49+
-spec(start() -> {'ok', pid()} | {'error', any()}).
50+
-spec(join(name(), pid()) -> 'ok').
51+
-spec(leave(name(), pid()) -> 'ok').
52+
-spec(get_members(name()) -> [pid()]).
53+
-spec(in_group(name(), pid()) -> boolean()).
54+
55+
-spec(sync() -> 'ok').
5656

5757
-endif.
5858

‎src/rabbit.erl

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -206,38 +206,37 @@
206206
-type(param() :: atom()).
207207
-type(app_name() :: atom()).
208208

209-
-spec(start/0 :: () -> 'ok').
210-
-spec(boot/0 :: () -> 'ok').
211-
-spec(stop/0 :: () -> 'ok').
212-
-spec(stop_and_halt/0 :: () -> no_return()).
213-
-spec(await_startup/0 :: () -> 'ok').
214-
-spec(status/0 ::
215-
() -> [{pid, integer()} |
216-
{running_applications, [{atom(), string(), string()}]} |
217-
{os, {atom(), atom()}} |
218-
{erlang_version, string()} |
219-
{memory, any()}]).
220-
-spec(is_running/0 :: () -> boolean()).
221-
-spec(is_running/1 :: (node()) -> boolean()).
222-
-spec(environment/0 :: () -> [{param(), term()}]).
223-
-spec(rotate_logs/1 :: (file_suffix()) -> rabbit_types:ok_or_error(any())).
224-
-spec(force_event_refresh/1 :: (reference()) -> 'ok').
225-
226-
-spec(log_location/1 :: ('sasl' | 'kernel') -> log_location()).
227-
228-
-spec(start/2 :: ('normal',[]) ->
209+
-spec(start() -> 'ok').
210+
-spec(boot() -> 'ok').
211+
-spec(stop() -> 'ok').
212+
-spec(stop_and_halt() -> no_return()).
213+
-spec(await_startup() -> 'ok').
214+
-spec(status() -> [{pid, integer()} |
215+
{running_applications, [{atom(), string(), string()}]} |
216+
{os, {atom(), atom()}} |
217+
{erlang_version, string()} |
218+
{memory, any()}]).
219+
-spec(is_running() -> boolean()).
220+
-spec(is_running(node()) -> boolean()).
221+
-spec(environment() -> [{param(), term()}]).
222+
-spec(rotate_logs(file_suffix()) -> rabbit_types:ok_or_error(any())).
223+
-spec(force_event_refresh(reference()) -> 'ok').
224+
225+
-spec(log_location('sasl' | 'kernel') -> log_location()).
226+
227+
-spec(start('normal',[]) ->
229228
{'error',
230229
{'erlang_version_too_old',
231230
{'found',string(),string()},
232231
{'required',string(),string()}}} |
233232
{'ok',pid()}).
234-
-spec(stop/1 :: (_) -> 'ok').
233+
-spec(stop(_) -> 'ok').
235234

236-
-spec(maybe_insert_default_data/0 :: () -> 'ok').
237-
-spec(boot_delegate/0 :: () -> 'ok').
238-
-spec(recover/0 :: () -> 'ok').
239-
-spec(start_apps/1 :: ([app_name()]) -> 'ok').
240-
-spec(stop_apps/1 :: ([app_name()]) -> 'ok').
235+
-spec(maybe_insert_default_data() -> 'ok').
236+
-spec(boot_delegate() -> 'ok').
237+
-spec(recover() -> 'ok').
238+
-spec(start_apps([app_name()]) -> 'ok').
239+
-spec(stop_apps([app_name()]) -> 'ok').
241240

242241
-endif.
243242

@@ -601,7 +600,7 @@ prep_stop(_State) ->
601600
stop(_) -> ok.
602601

603602
-ifdef(use_specs).
604-
-spec(boot_error/2 :: (term(), not_available | [tuple()]) -> no_return()).
603+
-spec(boot_error(term(), not_available | [tuple()]) -> no_return()).
605604
-endif.
606605
boot_error({could_not_start, rabbit, {{timeout_waiting_for_tables, _}, _}},
607606
_Stacktrace) ->
@@ -631,8 +630,8 @@ boot_error(Reason, Stacktrace) ->
631630
boot_error(Reason, Fmt, Args, Stacktrace).
632631

633632
-ifdef(use_specs).
634-
-spec(boot_error/4 :: (term(), string(), [any()], not_available | [tuple()])
635-
-> no_return()).
633+
-spec(boot_error(term(), string(), [any()], not_available | [tuple()])
634+
-> no_return()).
636635
-endif.
637636
boot_error(Reason, Fmt, Args, not_available) ->
638637
log_boot_error_and_exit(Reason, Fmt, Args);

0 commit comments

Comments
 (0)