Use rabbit_misc:rs/1 on exchange resource records

This fixes a potential crash in `rabbit_amqp_amanegment` where we tried
to format the exchange resource as a string (`~ts`). The change in
`rabbit_channel` is cosmetic.

Author: the-mikedavis

deps/rabbit/src/rabbit_amqp_management.erl

@@ -218,9 +218,9 @@ handle_http_req(<<"PUT">>,
                     {error, timeout} ->
                         throw(
                           <<"503">>,
-                          "Could not create exchange '~ts' in vhost '~ts' "
-                          "because the operation timed out",
-                          [XName, Vhost])
+                          "Could not create ~ts because the operation "
+                          "timed out",
+                          [rabbit_misc:rs(XName)])
                 end
         end,
     try rabbit_exchange:assert_equivalence(
@@ -300,8 +300,8 @@ handle_http_req(<<"DELETE">>,
         {error, timeout} ->
             throw(
               <<"503">>,
-              "failed to delete exchange '~ts' due to a timeout",
-              [XNameBin])
+              "failed to delete ~ts due to a timeout",
+              [rabbit_misc:rs(XName)])
     end;
 
 handle_http_req(<<"POST">>,

deps/rabbit/src/rabbit_channel.erl

@@ -2581,9 +2581,9 @@ handle_method(#'exchange.declare'{exchange    = XNameBin,
                     {error, timeout} ->
                         rabbit_misc:protocol_error(
                           internal_error,
-                          "failed to declare exchange '~ts' in vhost '~ts' "
-                          "because the operation timed out",
-                          [XNameBinStripped, VHostPath])
+                          "failed to declare ~ts because the operation "
+                          "timed out",
+                          [rabbit_misc:rs(ExchangeName)])
                 end
         end,
     ok = rabbit_exchange:assert_equivalence(X, CheckedType, Durable,