spacebar/rust-nex
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 50 Wiki Activity Actions

fix(protocols): fix macro

Browse source
This commit is contained in:
DJMrTV 2025-02-01 20:59:21 +01:00
commit 44bcad7eda
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/protocols/mod.rs
View file

@ -3,21 +3,28 @@ pub mod server;
#[macro_export] #[macro_export]
macro_rules! define_protocol { macro_rules! define_protocol {
($id:literal $( <$lifetime:lifetime> )?($($varname:ident : $ty:ty),*) => {$($func_id:literal => $func:path),*} ) => { ($id:literal $( <$lifetime:lifetime> )?($($varname:ident : $ty:ty),*) => {$($func_id:literal => $func:path),*} ) => {
fn protocol $( <$lifetime> )? (rmcmessage: &RMCMessage, $($varname : $ty,)*) -> Option<RMCResponse>{ fn protocol $( <$lifetime> )? (rmcmessage: &RMCMessage, $($varname : $ty),*) -> Option<RMCResponse>{
if rmcmessage.protocol_id != $id{ if rmcmessage.protocol_id != $id{
return None; return None;
} }
let response_result = match rmcmessage.method_id{ let response_function = match rmcmessage.method_id{
$( $(
$func_id => $func(rmcmessage), $func_id => $func,
),* )*
_ => { _ => {
error!("invalid method id sent to protocol {}: {:?}", $id, rmcmessage.method_id); error!("invalid method id sent to protocol {}: {:?}", $id, rmcmessage.method_id);
rmcmessage.error_result_with_code(ErrorCode::Core_NotImplemented) return Some(
RMCResponse{
protocol_id: $id,
response_result: rmcmessage.error_result_with_code(ErrorCode::Core_NotImplemented)
}
);
} }
}; };
let response_result = response_function(rmcmessage, $($varname),*);
Some(RMCResponse{ Some(RMCResponse{
protocol_id: $id, protocol_id: $id,
response_result response_result