Merge pull request #968 from psychon/fix-ci

Fix CI: Deal with a new clippy warning and pin a dependency which bumped its MSRV

Author: mergify[bot]

.github/workflows/CI.yml

@@ -185,6 +185,8 @@ jobs:
       run: cargo update --package async-io --precise 2.5.0
     - name: Pin last polling release supporting our msrv of Rust 1.68
       run: cargo update --package polling --precise 3.10.0
+    - name: Pin last async-lock release supporting our msrv of Rust 1.68
+      run: cargo update --package async-lock --precise 3.4.1
 
     # build
     - name: cargo check x11rb-protocol with all features

generator/src/generator/namespace/mod.rs

@@ -569,25 +569,28 @@ impl<'ns, 'c> NamespaceGenerator<'ns, 'c> {
                         out,
                     );
                     let field_size = field.size().unwrap();
-                    if bytes_name.is_some() && field_size == union_size {
-                        outln!(out, "Self({})", bytes_name.unwrap());
-                    } else {
-                        outln!(out, "let value = [");
-                        for result_byte in result_bytes.iter() {
-                            outln!(out.indent(), "{},", result_byte);
+                    match bytes_name {
+                        Some(bytes_name) if field_size == union_size => {
+                            outln!(out, "Self({})", bytes_name);
                         }
-                        // This is needed to handle cases such as Behavior.type or
-                        // Action.type from the XKB extension.
-                        //
-                        // FIXME: For those cases it might be better to omit the
-                        // serialize implementation.
-                        if field_size != union_size {
-                            for _ in 0..(union_size - field_size) {
-                                outln!(out.indent(), "0,");
+                        _ => {
+                            outln!(out, "let value = [");
+                            for result_byte in result_bytes.iter() {
+                                outln!(out.indent(), "{},", result_byte);
+                            }
+                            // This is needed to handle cases such as Behavior.type or
+                            // Action.type from the XKB extension.
+                            //
+                            // FIXME: For those cases it might be better to omit the
+                            // serialize implementation.
+                            if field_size != union_size {
+                                for _ in 0..(union_size - field_size) {
+                                    outln!(out.indent(), "0,");
+                                }
                             }
+                            outln!(out, "];");
+                            outln!(out, "Self(value)");
                         }
-                        outln!(out, "];");
-                        outln!(out, "Self(value)");
                     }
                 });
                 outln!(out, "}}");