Named arguments for encoder macros

hsivonen · Nov 12, 2024 · 93d0577 · 93d0577
1 parent f85c995
commit 93d0577
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/src/iso_2022_jp.rs b/src/iso_2022_jp.rs
@@ -517,7 +517,7 @@ impl Iso2022JpEncoder {
     }
 
     encoder_functions!(
-        {
+        eof = {
             match self.state {
                 Iso2022JpEncoderState::Ascii => {}
                 _ => match dest.check_space_three() {
@@ -531,7 +531,7 @@ impl Iso2022JpEncoder {
                 },
             }
         },
-        {
+        body = {
             match self.state {
                 Iso2022JpEncoderState::Ascii => {
                     if c == '\u{0E}' || c == '\u{0F}' || c == '\u{1B}' {
@@ -734,14 +734,14 @@ impl Iso2022JpEncoder {
                 }
             }
         },
-        self,
-        src_consumed,
-        source,
-        dest,
-        c,
-        destination_handle,
-        unread_handle,
-        check_space_three
+        self = self,
+        src_consumed = src_consumed,
+        source = source,
+        dest = dest,
+        c = c,
+        destination_handle = destination_handle,
+        unread_handle = unread_handle,
+        destination_check = check_space_three
     );
 }
 

diff --git a/src/macros.rs b/src/macros.rs
@@ -1010,16 +1010,16 @@ macro_rules! encoder_function {
 
 macro_rules! encoder_functions {
     (
-        $eof:block,
-        $body:block,
-        $slf:ident,
-        $src_consumed:ident,
-        $source:ident,
-        $dest:ident,
-        $c:ident,
-        $destination_handle:ident,
-        $unread_handle:ident,
-        $destination_check:ident
+        eof = $eof:block,
+        body = $body:block,
+        self = $slf:ident,
+        src_consumed = $src_consumed:ident,
+        source = $source:ident,
+        dest = $dest:ident,
+        c = $c:ident,
+        destination_handle = $destination_handle:ident,
+        unread_handle = $unread_handle:ident,
+        destination_check = $destination_check:ident
     ) => {
         encoder_function!(
             $eof,

diff --git a/src/x_user_defined.rs b/src/x_user_defined.rs
@@ -171,8 +171,8 @@ impl UserDefinedEncoder {
     }
 
     encoder_functions!(
-        {},
-        {
+        eof = {},
+        body = {
             if c <= '\u{7F}' {
                 // TODO optimize ASCII run
                 destination_handle.write_one(c as u8);
@@ -188,14 +188,14 @@ impl UserDefinedEncoder {
             destination_handle.write_one((u32::from(c) - 0xF700) as u8);
             continue;
         },
-        self,
-        src_consumed,
-        source,
-        dest,
-        c,
-        destination_handle,
-        unread_handle,
-        check_space_one
+        self = self,
+        src_consumed = src_consumed,
+        source = source,
+        dest = dest,
+        c = c,
+        destination_handle = destination_handle,
+        unread_handle = unread_handle,
+        destination_check = check_space_one
     );
 }