user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove reverse_{encode, decode}!

Browse source
This commit is contained in:
cyrgani 2025-09-29 23:42:01 +02:00
parent 7af913fc90
commit 9bb4081fb0
3 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/proc_macro/src/bridge/client.rs
View file

@ -144,7 +144,7 @@ macro_rules! define_client_side {
buf.clear();
api_tags::Method::$name(api_tags::$name::$method).encode(&mut buf, &mut ());
reverse_encode!(buf; $($arg),*);
$($arg.encode(&mut buf, &mut ());)*
buf = bridge.dispatch.call(buf);

20
library/proc_macro/src/bridge/mod.rs
View file

@ -119,26 +119,6 @@ macro_rules! with_api_handle_types {
};
}
// FIXME(eddyb) this calls `encode` for each argument, but in reverse,
// to match the ordering in `reverse_decode`.
macro_rules! reverse_encode {
($writer:ident;) => {};
($writer:ident; $first:ident $(, $rest:ident)*) => {
reverse_encode!($writer; $($rest),*);
$first.encode(&mut $writer, &mut ());
}
}
// FIXME(eddyb) this calls `decode` for each argument, but in reverse,
// to avoid borrow conflicts from borrows started by `&mut` arguments.
macro_rules! reverse_decode {
($reader:ident, $s:ident;) => {};
($reader:ident, $s:ident; $first:ident: $first_ty:ty $(, $rest:ident: $rest_ty:ty)*) => {
reverse_decode!($reader, $s; $($rest: $rest_ty),*);
let $first = <$first_ty>::decode(&mut $reader, $s);
}
}
#[allow(unsafe_code)]
mod arena;
#[allow(unsafe_code)]

2
library/proc_macro/src/bridge/server.rs
View file

@ -178,7 +178,7 @@ macro_rules! define_dispatcher_impl {
$(api_tags::Method::$name(m) => match m {
$(api_tags::$name::$method => {
let mut call_method = || {
reverse_decode!(reader, handle_store; $($arg: $arg_ty),*);
$(let $arg = <$arg_ty>::decode(&mut reader, handle_store);)*
$name::$method(server, $($arg),*)
};
// HACK(eddyb) don't use `panic::catch_unwind` in a panic.