parsing: fixed parsing frames with attributes contained dashes

amqp-rs · Sep 21, 2024 · 1e1fb83 · 1e1fb83
1 parent 0364d9c
commit 1e1fb83
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/protocol/src/frame/parsing.rs b/protocol/src/frame/parsing.rs
@@ -157,4 +157,25 @@ mod test {
             Ok((&[][..], AMQPFrame::Heartbeat(1)))
         );
     }
+
+    #[test]
+    fn test_parse_declare_queue_frame() {
+        let frame = AMQPFrame::Method(
+            1,
+            AMQPClass::Queue(queue::AMQPMethod::Declare(queue::Declare {
+                queue: "some_queue".into(),
+                passive: true,
+                durable: true,
+                exclusive: true,
+                auto_delete: true,
+                nowait: true,
+                arguments: Default::default(),
+            })),
+        );
+
+        let mut buffer = vec![0u8; 30];
+
+        assert!(gen_frame(&frame)(buffer.as_mut_slice().into()).is_ok());
+        assert_eq!(parse_frame(buffer.as_slice()), Ok((&[][..], frame)));
+    }
 }
diff --git a/protocol/src/generated.rs b/protocol/src/generated.rs
@@ -628,7 +628,7 @@ pub mod basic {
         let (i, _) = parse_short_uint(i)?;
         let (i, queue) = parse_short_string(i)?;
         let (i, consumer_tag) = parse_short_string(i)?;
-        let (i, flags) = parse_flags(i, &["no-local", "no-ack", "exclusive", "nowait"])?;
+        let (i, flags) = parse_flags(i, &["no_local", "no_ack", "exclusive", "nowait"])?;
         let (i, arguments) = parse_field_table(i)?;
         Ok((
             i,
@@ -980,7 +980,7 @@ pub mod basic {
     pub fn parse_get<I: ParsableInput>(i: I) -> ParserResult<I, Get> {
         let (i, _) = parse_short_uint(i)?;
         let (i, queue) = parse_short_string(i)?;
-        let (i, flags) = parse_flags(i, &["no-ack"])?;
+        let (i, flags) = parse_flags(i, &["no_ack"])?;
         Ok((
             i,
             Get {
@@ -2998,7 +2998,7 @@ pub mod exchange {
         let (i, kind) = parse_short_string(i)?;
         let (i, flags) = parse_flags(
             i,
-            &["passive", "durable", "auto-delete", "internal", "nowait"],
+            &["passive", "durable", "auto_delete", "internal", "nowait"],
         )?;
         let (i, arguments) = parse_field_table(i)?;
         Ok((
@@ -3093,7 +3093,7 @@ pub mod exchange {
     pub fn parse_delete<I: ParsableInput>(i: I) -> ParserResult<I, Delete> {
         let (i, _) = parse_short_uint(i)?;
         let (i, exchange) = parse_short_string(i)?;
-        let (i, flags) = parse_flags(i, &["if-unused", "nowait"])?;
+        let (i, flags) = parse_flags(i, &["if_unused", "nowait"])?;
         Ok((
             i,
             Delete {
@@ -3476,7 +3476,7 @@ pub mod queue {
         let (i, queue) = parse_short_string(i)?;
         let (i, flags) = parse_flags(
             i,
-            &["passive", "durable", "exclusive", "auto-delete", "nowait"],
+            &["passive", "durable", "exclusive", "auto_delete", "nowait"],
         )?;
         let (i, arguments) = parse_field_table(i)?;
         Ok((
@@ -3769,7 +3769,7 @@ pub mod queue {
     pub fn parse_delete<I: ParsableInput>(i: I) -> ParserResult<I, Delete> {
         let (i, _) = parse_short_uint(i)?;
         let (i, queue) = parse_short_string(i)?;
-        let (i, flags) = parse_flags(i, &["if-unused", "if-empty", "nowait"])?;
+        let (i, flags) = parse_flags(i, &["if_unused", "if_empty", "nowait"])?;
         Ok((
             i,
             Delete {

diff --git a/protocol/templates/protocol.rs b/protocol/templates/protocol.rs
@@ -241,7 +241,7 @@ pub mod {{snake class.name}} {
         {{else}}
         let (i, {{#if argument.ignore_flags ~}}_{{else}}flags{{/if ~}}) = parse_flags(i, &[
             {{#each argument.flags as |flag| ~}}
-            "{{flag.name}}",
+            "{{snake flag.name}}",
             {{/each ~}}
         ])?;
         {{/if ~}}