diff options
| -rw-r--r-- | src/bpqueue.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bpqueue.erl b/src/bpqueue.erl index 0210436f30..a0c0c41b30 100644 --- a/src/bpqueue.erl +++ b/src/bpqueue.erl @@ -225,10 +225,7 @@ from_list(List) -> to_list({0, _Q}) -> []; to_list({_N, Q}) -> - lists:map(fun to_list1/1, queue:to_list(Q)). - -to_list1({Prefix, InnerQ}) -> - {Prefix, queue:to_list(InnerQ)}. + [{Prefix, queue:to_list(InnerQ)} || {Prefix, InnerQ} <- queue:to_list(Q)]. %% map_fold_filter_[lr](FilterFun, Fun, Init, BPQ) -> {BPQ, Init} %% where FilterFun(Prefix) -> boolean() diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 217b2809f8..9836a9883d 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -323,6 +323,9 @@ test_bpqueue() -> {[], 0} = Queue_to_list(bpqueue:map_fold_filter_l( fun(_P)-> throw(explosion) end, fun(_V, _N) -> throw(explosion) end, 0, Q)), + {[], 0} = Queue_to_list(bpqueue:map_fold_filter_r( + fun(_P)-> throw(explosion) end, + fun(_V, _N) -> throw(explosion) end, 0, Q)), %% process 1 item {[{foo,[-1,2,2]}, {bar,[3,4,5]}, {foo,[5,6,7]}], 1} = |