Rollup merge of #147497 - cyrgani:proc-macro-cleanups-3, r=petrochenkov

`proc_macro` cleanups (3/N)
Followup to #147386, which removed the old `Decode` trait.
Can be reviewed commit by commit.

Author: Zalathar

library/proc_macro/src/bridge/client.rs

@@ -58,7 +58,7 @@ macro_rules! define_client_handles {
 }
 }
 
-impl<S> DecodeMut<'_,'_,S> for $oty {
+impl<S> Decode<'_,'_,S> for $oty {
 fn decode(r:&mutReader<'_>, s:&mutS) -> Self{
  $oty {
  handle: handle::Handle::decode(r, s),
@@ -82,7 +82,7 @@ macro_rules! define_client_handles {
 }
 }
 
-impl<S> DecodeMut<'_,'_,S> for $ity {
+impl<S> Decode<'_,'_,S> for $ity {
 fn decode(r:&mutReader<'_>, s:&mutS) -> Self{
  $ity {
  handle: handle::Handle::decode(r, s),
@@ -276,7 +276,7 @@ fn maybe_install_panic_hook(force_show_panics: bool) {
 /// Client-side helper for handling client panics, entering the bridge,
 /// deserializing input and serializing output.
 // FIXME(eddyb) maybe replace `Bridge::enter` with this?
-fnrun_client<A:for<'a,'s>DecodeMut<'a,'s,()>,R:Encode<()>>(
+fnrun_client<A:for<'a,'s>Decode<'a,'s,()>,R:Encode<()>>(
 config:BridgeConfig<'_>,
 f:implFnOnce(A) -> R,
 ) -> Buffer{

library/proc_macro/src/bridge/mod.rs

@@ -143,7 +143,7 @@ mod symbol;
 
 use buffer::Buffer;
 pubuse rpc::PanicMessage;
-use rpc::{DecodeMut,Encode,Reader,Writer};
+use rpc::{Decode,Encode,Reader,Writer};
 
 /// Configuration for establishing an active connection between a server and a
 /// client. The server creates the bridge config (`run_server` in `server.rs`),
@@ -168,7 +168,7 @@ impl !Sync for BridgeConfig<'_> {}
 #[forbid(unsafe_code)]
 #[allow(non_camel_case_types)]
 mod api_tags {
-usesuper::rpc::{DecodeMut,Encode,Reader,Writer};
+usesuper::rpc::{Decode,Encode,Reader,Writer};
 
 macro_rules! declare_tags {
 ($($name:ident {

library/proc_macro/src/bridge/rpc.rs

@@ -12,7 +12,7 @@ pub(super) trait Encode<S>: Sized {
 
 pub(super)typeReader<'a> = &'a[u8];
 
-pub(super)traitDecodeMut<'a,'s,S>:Sized{
+pub(super)traitDecode<'a,'s,S>:Sized{
 fndecode(r:&mutReader<'a>,s:&'smutS) -> Self;
 }
 
@@ -24,7 +24,7 @@ macro_rules! rpc_encode_decode {
 }
 }
 
-impl<S> DecodeMut<'_,'_,S> for $ty {
+impl<S> Decode<'_,'_,S> for $ty {
 fn decode(r:&mutReader<'_>, _:&mutS) -> Self{
 constN:usize = size_of::<$ty>();
 
@@ -43,12 +43,12 @@ macro_rules! rpc_encode_decode {
 }
 }
 
-impl<'a,S, $($($T:for<'s> DecodeMut<'a,'s,S>),+)?> DecodeMut<'a,'_,S>
+impl<'a,S, $($($T:for<'s> Decode<'a,'s,S>),+)?> Decode<'a,'_,S>
 for $name $(<$($T),+>)?
 {
 fn decode(r:&mutReader<'a>, s:&mutS) -> Self{
  $name {
- $($field:DecodeMut::decode(r, s)),*
+ $($field:Decode::decode(r, s)),*
 }
 }
 }
@@ -58,23 +58,18 @@ macro_rules! rpc_encode_decode {
 fn encode(self, w:&mutWriter, s:&mutS){
 // HACK(eddyb): `Tag` enum duplicated between the
 // two impls as there's no other place to stash it.
- #[allow(non_upper_case_globals)]
-mod tag {
- #[repr(u8)]enumTag{ $($variant),*}
-
- $(pub(crate)const $variant:u8 = Tag::$variant asu8;)*
-}
+ #[repr(u8)]enumTag{ $($variant),*}
 
 matchself{
  $($name::$variant $(($field))* => {
-tag::$variant.encode(w, s);
+(Tag::$variantasu8).encode(w, s);
  $($field.encode(w, s);)*
 })*
 }
 }
 }
 
-impl<'a,S, $($($T:for<'s> DecodeMut<'a,'s,S>),+)?> DecodeMut<'a,'_,S>
+impl<'a,S, $($($T:for<'s> Decode<'a,'s,S>),+)?> Decode<'a,'_,S>
 for $name $(<$($T),+>)?
 {
 fn decode(r:&mutReader<'a>, s:&mutS) -> Self{
@@ -89,7 +84,7 @@ macro_rules! rpc_encode_decode {
 
 matchu8::decode(r, s){
  $(tag::$variant => {
- $(let $field = DecodeMut::decode(r, s);)*
+ $(let $field = Decode::decode(r, s);)*
  $name::$variant $(($field))*
 })*
  _ => unreachable!(),
@@ -103,7 +98,7 @@ impl<S> Encode<S> for () {
 fnencode(self, _:&mutWriter, _:&mutS){}
 }
 
-impl<S>DecodeMut<'_,'_,S>for(){
+impl<S>Decode<'_,'_,S>for(){
 fndecode(_:&mutReader<'_>, _:&mutS) -> Self{}
 }
 
@@ -113,7 +108,7 @@ impl<S> Encode<S> for u8 {
 }
 }
 
-impl<S>DecodeMut<'_,'_,S>foru8{
+impl<S>Decode<'_,'_,S>foru8{
 fndecode(r:&mutReader<'_>, _:&mutS) -> Self{
 let x = r[0];
 *r = &r[1..];
@@ -130,7 +125,7 @@ impl<S> Encode<S> for bool {
 }
 }
 
-impl<S>DecodeMut<'_,'_,S>forbool{
+impl<S>Decode<'_,'_,S>forbool{
 fndecode(r:&mutReader<'_>,s:&mutS) -> Self{
 match u8::decode(r, s){
 0 => false,
@@ -146,7 +141,7 @@ impl<S> Encode<S> for char {
 }
 }
 
-impl<S>DecodeMut<'_,'_,S>forchar{
+impl<S>Decode<'_,'_,S>forchar{
 fndecode(r:&mutReader<'_>,s:&mutS) -> Self{
  char::from_u32(u32::decode(r, s)).unwrap()
 }
@@ -158,7 +153,7 @@ impl<S> Encode<S> for NonZero<u32> {
 }
 }
 
-impl<S>DecodeMut<'_,'_,S>forNonZero<u32>{
+impl<S>Decode<'_,'_,S>forNonZero<u32>{
 fndecode(r:&mutReader<'_>,s:&mutS) -> Self{
 Self::new(u32::decode(r, s)).unwrap()
 }
@@ -171,11 +166,11 @@ impl<S, A: Encode<S>, B: Encode<S>> Encode<S> for (A, B) {
 }
 }
 
-impl<'a,S,A:for<'s>DecodeMut<'a,'s,S>,B:for<'s>DecodeMut<'a,'s,S>>DecodeMut<'a,'_,S>
+impl<'a,S,A:for<'s>Decode<'a,'s,S>,B:for<'s>Decode<'a,'s,S>>Decode<'a,'_,S>
 for(A,B)
 {
 fndecode(r:&mutReader<'a>,s:&mutS) -> Self{
-(DecodeMut::decode(r, s),DecodeMut::decode(r, s))
+(Decode::decode(r, s),Decode::decode(r, s))
 }
 }
 
@@ -186,7 +181,7 @@ impl<S> Encode<S> for &[u8] {
 }
 }
 
-impl<'a,S>DecodeMut<'a,'_,S>for&'a[u8]{
+impl<'a,S>Decode<'a,'_,S>for&'a[u8]{
 fndecode(r:&mutReader<'a>,s:&mutS) -> Self{
 let len = usize::decode(r, s);
 let xs = &r[..len];
@@ -201,7 +196,7 @@ impl<S> Encode<S> for &str {
 }
 }
 
-impl<'a,S>DecodeMut<'a,'_,S>for&'astr{
+impl<'a,S>Decode<'a,'_,S>for&'astr{
 fndecode(r:&mutReader<'a>,s:&mutS) -> Self{
  str::from_utf8(<&[u8]>::decode(r, s)).unwrap()
 }
@@ -213,7 +208,7 @@ impl<S> Encode<S> for String {
 }
 }
 
-impl<S>DecodeMut<'_,'_,S>forString{
+impl<S>Decode<'_,'_,S>forString{
 fndecode(r:&mutReader<'_>,s:&mutS) -> Self{
  <&str>::decode(r, s).to_string()
 }
@@ -228,7 +223,7 @@ impl<S, T: Encode<S>> Encode<S> for Vec<T> {
 }
 }
 
-impl<'a,S,T:for<'s>DecodeMut<'a,'s,S>>DecodeMut<'a,'_,S>forVec<T>{
+impl<'a,S,T:for<'s>Decode<'a,'s,S>>Decode<'a,'_,S>forVec<T>{
 fndecode(r:&mutReader<'a>,s:&mutS) -> Self{
 let len = usize::decode(r, s);
 letmut vec = Vec::with_capacity(len);
@@ -288,7 +283,7 @@ impl<S> Encode<S> for PanicMessage {
 }
 }
 
-impl<S>DecodeMut<'_,'_,S>forPanicMessage{
+impl<S>Decode<'_,'_,S>forPanicMessage{
 fndecode(r:&mutReader<'_>,s:&mutS) -> Self{
 matchOption::<String>::decode(r, s){
 Some(s) => PanicMessage::String(s),

library/proc_macro/src/bridge/selfless_reify.rs

@@ -50,7 +50,7 @@ macro_rules! define_reify_functions {
  >(f:F) -> $(extern $abi)? fn($($arg_ty),*) -> $ret_ty {
 // FIXME(eddyb) describe the `F` type (e.g. via `type_name::<F>`) once panic
 // formatting becomes possible in `const fn`.
- assert!(size_of::<F>() == 0,"selfless_reify: closure must be zero-sized");
+const{assert!(size_of::<F>() == 0,"selfless_reify: closure must be zero-sized");}
 
  $(extern $abi)? fn wrapper<
  $($($param,)*)?

library/proc_macro/src/bridge/server.rs

@@ -32,23 +32,23 @@ macro_rules! define_server_handles {
 }
 }
 
-impl<S:Types> DecodeMut<'_,'_,HandleStore<MarkedTypes<S>>>
+impl<S:Types> Decode<'_,'_,HandleStore<MarkedTypes<S>>>
 forMarked<S::$oty, client::$oty>
 {
 fn decode(r:&mutReader<'_>, s:&mutHandleStore<MarkedTypes<S>>) -> Self{
  s.$oty.take(handle::Handle::decode(r,&mut()))
 }
 }
 
-impl<'s,S:Types> DecodeMut<'_,'s,HandleStore<MarkedTypes<S>>>
+impl<'s,S:Types> Decode<'_,'s,HandleStore<MarkedTypes<S>>>
 for&'s Marked<S::$oty, client::$oty>
 {
 fn decode(r:&mutReader<'_>, s:&'s mutHandleStore<MarkedTypes<S>>) -> Self{
 &s.$oty[handle::Handle::decode(r,&mut())]
 }
 }
 
-impl<'s,S:Types> DecodeMut<'_,'s,HandleStore<MarkedTypes<S>>>
+impl<'s,S:Types> Decode<'_,'s,HandleStore<MarkedTypes<S>>>
 for&'s mutMarked<S::$oty, client::$oty>
 {
 fn decode(
@@ -67,7 +67,7 @@ macro_rules! define_server_handles {
 }
 }
 
-impl<S:Types> DecodeMut<'_,'_,HandleStore<MarkedTypes<S>>>
+impl<S:Types> Decode<'_,'_,HandleStore<MarkedTypes<S>>>
 forMarked<S::$ity, client::$ity>
 {
 fn decode(r:&mutReader<'_>, s:&mutHandleStore<MarkedTypes<S>>) -> Self{
@@ -355,7 +355,7 @@ pub trait MessagePipe<T>: Sized {
 fnrun_server<
 S:Server,
 I:Encode<HandleStore<MarkedTypes<S>>>,
-O:for<'a,'s>DecodeMut<'a,'s,HandleStore<MarkedTypes<S>>>,
+O:for<'a,'s>Decode<'a,'s,HandleStore<MarkedTypes<S>>>,
 >(
 strategy:&implExecutionStrategy,
 handle_counters:&'static client::HandleCounters,

library/proc_macro/src/bridge/symbol.rs

@@ -102,7 +102,7 @@ impl<S> Encode<S> for Symbol {
 }
 }
 
-impl<S: server::Server>DecodeMut<'_,'_, server::HandleStore<server::MarkedTypes<S>>>
+impl<S: server::Server>Decode<'_,'_, server::HandleStore<server::MarkedTypes<S>>>
 forMarked<S::Symbol,Symbol>
 {
 fndecode(r:&mutReader<'_>,s:&mut server::HandleStore<server::MarkedTypes<S>>) -> Self{
@@ -118,7 +118,7 @@ impl<S: server::Server> Encode<server::HandleStore<server::MarkedTypes<S>>>
 }
 }
 
-impl<S>DecodeMut<'_,'_,S>forSymbol{
+impl<S>Decode<'_,'_,S>forSymbol{
 fndecode(r:&mutReader<'_>,s:&mutS) -> Self{
 Symbol::new(<&str>::decode(r, s))
 }