Makes Result type in declare_builtin_function!() parametric too.

solana-labs · Oct 12, 2023 · 968a774 · 968a774
1 parent 1f05462
commit 968a774
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/program.rs b/src/program.rs
@@ -296,7 +296,7 @@ macro_rules! declare_builtin_function {
         $arg_d:ident : u64,
         $arg_e:ident : u64,
         $memory_mapping:ident : &mut $MemoryMapping:ty,
-    ) -> Result<u64, $Error:ty> $rust:tt) => {
+    ) -> $Result:ty { $($rust:tt)* }) => {
         $(#[$attr])*
         pub struct $name {}
         impl $name {
@@ -309,8 +309,8 @@ macro_rules! declare_builtin_function {
                 $arg_d: u64,
                 $arg_e: u64,
                 $memory_mapping: &mut $MemoryMapping,
-            ) -> Result<u64, $Error> {
-                $rust
+            ) -> $Result {
+                $($rust)*
             }
             /// VM interface
             #[allow(clippy::too_many_arguments)]