From 2873f401fb528d36c99609ed1edd862b8a0bea5f Mon Sep 17 00:00:00 2001
From: Yaroslav Dynnikov <yaroslav.dynnikov@gmail.com>
Date: Mon, 25 Apr 2022 02:04:51 +0300
Subject: [PATCH] chore: minify tarantool_main macro use
---
src/main.rs | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index de43646ab0..7e48cfb7f5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -194,7 +194,7 @@ struct IpcMessage {
macro_rules! tarantool_main {
(
$tt_args:expr,
- callback_data: $cb_data:ident,
+ callback_data: $cb_data:tt,
callback_data_type: $cb_data_ty:ty,
callback_body: $cb_body:expr
) => {{
@@ -252,15 +252,12 @@ fn main_run(args: args::Run) -> ExitStatus {
ForkResult::Child => {
drop(rx);
- let tt_args = args.tt_args().unwrap();
- let data = (entrypoint, args, tx);
let rc = tarantool_main!(
- tt_args,
- callback_data: data,
+ args.tt_args().unwrap(),
+ callback_data: (entrypoint, args, tx),
callback_data_type: (Entrypoint, args::Run, ipc::Sender<IpcMessage>),
callback_body: {
- let (entrypoint, args, to_supervisor) = data;
- entrypoint.exec(args, to_supervisor)
+ entrypoint.exec(args, tx)
}
);
return ExitStatus { raw: rc };
--
GitLab