File rabbitmq-server-3.8.3-maybe.patch of Package rabbitmq-server

diff -Ndurp rabbitmq-server-3.8.3/src/rabbit_amqqueue.erl rabbitmq-server-3.8.3-maybe/src/rabbit_amqqueue.erl
--- rabbitmq-server-3.8.3/src/rabbit_amqqueue.erl	2020-03-07 20:32:13.000000000 +0200
+++ rabbitmq-server-3.8.3-maybe/src/rabbit_amqqueue.erl	2024-05-16 22:46:32.860233783 +0300
@@ -252,7 +252,7 @@ recover_durable_queues(QueuesAndRecovery
               boolean(),
               boolean(),
               rabbit_framing:amqp_table(),
-              rabbit_types:maybe(pid()),
+              rabbit_types:opt(pid()),
               rabbit_types:username()) ->
     {'new' | 'existing' | 'owner_died', amqqueue:amqqueue()} |
     {'new', amqqueue:amqqueue(), rabbit_fifo_client:state()} |
@@ -271,7 +271,7 @@ declare(QueueName, Durable, AutoDelete,
               boolean(),
               boolean(),
               rabbit_framing:amqp_table(),
-              rabbit_types:maybe(pid()),
+              rabbit_types:opt(pid()),
               rabbit_types:username(),
               node()) ->
     {'new' | 'existing' | 'owner_died', amqqueue:amqqueue()} |
@@ -801,7 +801,7 @@ priv_absent(QueueName, QPid, _IsDurable,
 
 -spec assert_equivalence
         (amqqueue:amqqueue(), boolean(), boolean(),
-         rabbit_framing:amqp_table(), rabbit_types:maybe(pid())) ->
+         rabbit_framing:amqp_table(), rabbit_types:opt(pid())) ->
             'ok' | rabbit_types:channel_exit() | rabbit_types:connection_exit().
 
 assert_equivalence(Q, DurableDeclare, AutoDeleteDeclare, Args1, Owner) ->
diff -Ndurp rabbitmq-server-3.8.3/src/rabbit_channel.erl rabbitmq-server-3.8.3-maybe/src/rabbit_channel.erl
--- rabbitmq-server-3.8.3/src/rabbit_channel.erl	2020-03-07 20:32:13.000000000 +0200
+++ rabbitmq-server-3.8.3-maybe/src/rabbit_channel.erl	2024-05-16 22:46:27.960342918 +0300
@@ -269,7 +269,7 @@ do(Pid, Method) ->
 
 -spec do
         (pid(), rabbit_framing:amqp_method_record(),
-         rabbit_types:maybe(rabbit_types:content())) ->
+         rabbit_types:opt(rabbit_types:content())) ->
             'ok'.
 
 do(Pid, Method, Content) ->
@@ -277,7 +277,7 @@ do(Pid, Method, Content) ->
 
 -spec do_flow
         (pid(), rabbit_framing:amqp_method_record(),
-         rabbit_types:maybe(rabbit_types:content())) ->
+         rabbit_types:opt(rabbit_types:content())) ->
             'ok'.
 
 do_flow(Pid, Method, Content) ->
diff -Ndurp rabbitmq-server-3.8.3/src/rabbit_channel_interceptor.erl rabbitmq-server-3.8.3-maybe/src/rabbit_channel_interceptor.erl
--- rabbitmq-server-3.8.3/src/rabbit_channel_interceptor.erl	2020-03-07 20:32:13.000000000 +0200
+++ rabbitmq-server-3.8.3-maybe/src/rabbit_channel_interceptor.erl	2024-05-16 22:46:39.096094896 +0300
@@ -28,8 +28,8 @@
 -type(method_name() :: rabbit_framing:amqp_method_name()).
 -type(original_method() :: rabbit_framing:amqp_method_record()).
 -type(processed_method() :: rabbit_framing:amqp_method_record()).
--type(original_content() :: rabbit_types:maybe(rabbit_types:content())).
--type(processed_content() :: rabbit_types:maybe(rabbit_types:content())).
+-type(original_content() :: rabbit_types:opt(rabbit_types:content())).
+-type(processed_content() :: rabbit_types:opt(rabbit_types:content())).
 -type(interceptor_state() :: term()).
 
 -callback description() -> [proplists:property()].