fix: preserve calldata visibility on return values

noir-lang · Feb 26, 2024 · 7006362 · 7006362
1 parent c63990e
commit 7006362
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/test_programs/execution_success/databus/src/main.nr b/test_programs/execution_success/databus/src/main.nr
@@ -1,6 +1,6 @@
 use dep::std;
 
-fn main(mut x: u32, y: call_datau32, z: call_data[u32; 4]) -> u32 {
+fn main(mut x: u32, y: call_datau32, z: call_data[u32; 4]) -> return_data u32 {
     let a = z[x];
     a + foo(y)
 }

diff --git a/tooling/nargo_fmt/src/visitor/item.rs b/tooling/nargo_fmt/src/visitor/item.rs
@@ -119,8 +119,10 @@ impl super::FmtVisitor<'_> {
                 result.push_str("distinct ");
             }
 
-            if let Visibility::Public = func.def.return_visibility {
-                result.push_str("pub ");
+            match func.def.return_visibility {
+                Visibility::Public => result.push_str("pub "),
+                Visibility::DataBus => result.push_str("return_data "),
+                Visibility::Private => (),
             }
 
             let typ = rewrite::typ(self, self.shape(), func.return_type());