Resolve a conflict (#9365)

Author: michaelklishin

deps/rabbit/src/rabbit_amqqueue.erl

@@ -2088,21 +2088,6 @@ get_bcc_queue(Q, BCCName) ->
     #resource{virtual_host = VHost} = amqqueue:get_name(Q),
     BCCQueueName = rabbit_misc:r(VHost, queue, BCCName),
     rabbit_amqqueue:lookup(BCCQueueName).
-<<<<<<< HEAD
-=======
-
-is_queue_args_combination_permitted(Q) ->
-    Durable = amqqueue:is_durable(Q),
-    Exclusive = is_exclusive(Q),
-    is_queue_args_combination_permitted(Durable, Exclusive).
-
-is_queue_args_combination_permitted(Durable, Exclusive) ->
-    case not Durable andalso not Exclusive of
-        false ->
-            true;
-        true ->
-            rabbit_deprecated_features:is_permitted(transient_nonexcl_queues)
-    end.
 
 -spec kill_queue_hard(node(), name()) -> ok.
 kill_queue_hard(Node, QRes = #resource{kind = queue}) ->
@@ -2161,14 +2146,3 @@ pid_or_crashed(Node, QRes = #resource{virtual_host = VHost, kind = queue}) ->
         Error = {error, _} -> Error;
         Reason             -> {error, Reason}
     end.
-<<<<<<< HEAD
-
-sup_child(Node, Sup) ->
-    case rpc:call(Node, supervisor, which_children, [Sup]) of
-        [{_, Child, _, _}]              -> {ok, Child};
-        []                              -> {error, no_child};
-        {badrpc, {'EXIT', {noproc, _}}} -> {error, no_sup}
-    end.
->>>>>>> f0a29c95a5 (make kill_queue/{2,3} and kill_queue_hard/{2,3} from crashing_queues_SUITE reusable)
-=======
->>>>>>> 5717bcd09d (refactor and move remote_sup_child/2 to rabbit_misc)

deps/rabbit/src/rabbit_channel.erl

@@ -1285,7 +1285,7 @@ handle_method(#'basic.publish'{exchange    = ExchangeNameBin,
                               State1#ch{tx = {Msgs1, Acks}}
                       end};
         {error, Reason} ->
-            precondition_failed("invalid message: ~tp", [Reason])
+            rabbit_misc:precondition_failed("invalid message: ~tp", [Reason])
     end;
 
 handle_method(#'basic.nack'{delivery_tag = DeliveryTag,

deps/rabbit_common/src/rabbit_misc.erl

@@ -83,17 +83,7 @@
 -export([maps_any/2]).
 -export([safe_ets_update_counter/3, safe_ets_update_counter/4, safe_ets_update_counter/5,
          safe_ets_update_element/3, safe_ets_update_element/4, safe_ets_update_element/5]).
-<<<<<<< HEAD
-=======
--export([is_even/1, is_odd/1]).
--export([is_valid_shortstr/1]).
-
--export([maps_any/2,
-         maps_put_truthy/3,
-         maps_put_falsy/3
-        ]).
 -export([remote_sup_child/2]).
->>>>>>> 5717bcd09d (refactor and move remote_sup_child/2 to rabbit_misc)
 
 %% Horrible macro to use in guards
 -define(IS_BENIGN_EXIT(R),
@@ -1637,60 +1627,12 @@ when is_function(Pred, 2) andalso is_map(Map) ->
 maps_any_1(_Pred, none) ->
   false;
 maps_any_1(Pred, {K, V, I}) ->
-<<<<<<< HEAD
   case Pred(K, V) of
       true ->
           true;
       false ->
           maps_any_1(Pred, maps:next(I))
   end.
-=======
-    case Pred(K, V) of
-        true ->
-            true;
-        false ->
-            maps_any_1(Pred, maps:next(I))
-    end.
-
--spec is_even(integer()) -> boolean().
-is_even(N) ->
-    (N band 1) =:= 0.
--spec is_odd(integer()) -> boolean().
-is_odd(N) ->
-    (N band 1) =:= 1.
-
--spec is_valid_shortstr(term()) -> boolean().
-is_valid_shortstr(Bin) when byte_size(Bin) < 256 ->
-    is_utf8_no_null(Bin);
-is_valid_shortstr(_) ->
-    false.
-
-is_utf8_no_null(<<>>) ->
-    true;
-is_utf8_no_null(<<0, _/binary>>) ->
-    false;
-is_utf8_no_null(<<_/utf8, Rem/binary>>) ->
-    is_utf8_no_null(Rem);
-is_utf8_no_null(_) ->
-    false.
-
--spec maps_put_truthy(Key, Value, Map) -> Map when
-      Map :: #{Key => Value}.
-maps_put_truthy(_K, undefined, M) ->
-    M;
-maps_put_truthy(_K, false, M) ->
-    M;
-maps_put_truthy(K, V, M) ->
-    maps:put(K, V, M).
-
--spec maps_put_falsy(Key, Value, Map) -> Map when
-      Map :: #{Key => Value}.
-maps_put_falsy(K, undefined, M) ->
-    maps:put(K, undefined, M);
-maps_put_falsy(K, false, M) ->
-    maps:put(K, false, M);
-maps_put_falsy(_K, _V, M) ->
-    M.
 
 -spec remote_sup_child(node(), rabbit_types:sup_ref()) -> rabbit_types:ok_or_error2(rabbit_types:child(), no_child | no_sup).
 remote_sup_child(Node, Sup) ->
@@ -1699,4 +1641,3 @@ remote_sup_child(Node, Sup) ->
         []                              -> {error, no_child};
         {badrpc, {'EXIT', {noproc, _}}} -> {error, no_sup}
     end.
->>>>>>> 5717bcd09d (refactor and move remote_sup_child/2 to rabbit_misc)