From d2054f237e1a95461c105c8103dbb5b88c24c28b Mon Sep 17 00:00:00 2001
From: Christof Petig <christof.petig@arcor.de>
Date: Tue, 11 Feb 2025 10:32:24 +0100
Subject: [PATCH] format variant with optional brackets around the sum

wit-bindgen generated Rust code warns because of unnecessary brackets
generated by the format() function
---
 crates/wit-parser/src/sizealign.rs | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/crates/wit-parser/src/sizealign.rs b/crates/wit-parser/src/sizealign.rs
index 35fc2334a1..931df1c95e 100644
--- a/crates/wit-parser/src/sizealign.rs
+++ b/crates/wit-parser/src/sizealign.rs
@@ -180,20 +180,38 @@ impl ArchitectureSize {
 
     // create a suitable expression in bytes from a pointer size argument
     pub fn format(&self, ptrsize_expr: &str) -> String {
+        self.format_term(ptrsize_expr, false)
+    }
+
+    // create a suitable expression in bytes from a pointer size argument,
+    // extended API with optional brackets around the sum
+    pub fn format_term(&self, ptrsize_expr: &str, suppress_brackets: bool) -> String {
         if self.pointers != 0 {
             if self.bytes > 0 {
                 // both
-                format!(
-                    "({}+{}*{ptrsize_expr})",
-                    self.constant_bytes(),
-                    self.pointers_to_add()
-                )
+                if suppress_brackets {
+                    format!(
+                        "{}+{}*{ptrsize_expr}",
+                        self.constant_bytes(),
+                        self.pointers_to_add()
+                    )
+                } else {
+                    format!(
+                        "({}+{}*{ptrsize_expr})",
+                        self.constant_bytes(),
+                        self.pointers_to_add()
+                    )
+                }
             } else if self.pointers == 1 {
                 // one pointer
                 ptrsize_expr.into()
             } else {
                 // only pointer
-                format!("({}*{ptrsize_expr})", self.pointers_to_add())
+                if suppress_brackets {
+                    format!("{}*{ptrsize_expr}", self.pointers_to_add())
+                } else {
+                    format!("({}*{ptrsize_expr})", self.pointers_to_add())
+                }
             }
         } else {
             // only bytes