rust: ensure all phantomdata properties of newtypes are public

adl-lang · Apr 20, 2023 · 55962cd · 55962cd
1 parent b3cd17c
commit 55962cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/haskell/compiler/adlc-lib1/ADL/Compiler/Backends/Rust.hs b/haskell/compiler/adlc-lib1/ADL/Compiler/Backends/Rust.hs
@@ -249,7 +249,7 @@ genNewType m decl Newtype{n_typeParams=typeParams, n_typeExpr=te} = do
     render name typeParams typeExprStr phantomFields
       =  ctemplate "#[derive($1)]" [T.intercalate "," (S.toList (stdTraitsFor te))]
       <> ctemplate "pub struct $1$2($3);"
-          [name, typeParamsExpr typeParams, T.intercalate ", " (["pub " <> typeExprStr] <> phantomFields)]
+          [name, typeParamsExpr typeParams, T.intercalate ", " (["pub " <> typeExprStr] <> (map ("pub " <>)  phantomFields))]
     phantomTypeParams = S.toList (S.difference (S.fromList typeParams) (typeExprTypeParams te))
 
 

diff --git a/haskell/compiler/tests/test7/rs-output/test7/adl/test7.rs b/haskell/compiler/tests/test7/rs-output/test7/adl/test7.rs
@@ -31,10 +31,10 @@ pub struct Int3(pub i64);
 pub type Int4 = i64;
 
 #[derive(Clone,Deserialize,Eq,Hash,PartialEq,Serialize)]
-pub struct Int5<X>(pub i64, PhantomData<X>);
+pub struct Int5<X>(pub i64, pub PhantomData<X>);
 
 #[derive(Clone,Deserialize,Eq,Hash,PartialEq,Serialize)]
-pub struct Int6<X>(pub i64, PhantomData<X>);
+pub struct Int6<X>(pub i64, pub PhantomData<X>);
 
 pub type String1 = String;
 
@@ -47,10 +47,10 @@ pub struct String3(pub String);
 pub type String4 = String;
 
 #[derive(Clone,Deserialize,Eq,Hash,PartialEq,Serialize)]
-pub struct String5<X>(pub String, PhantomData<X>);
+pub struct String5<X>(pub String, pub PhantomData<X>);
 
 #[derive(Clone,Deserialize,Eq,Hash,PartialEq,Serialize)]
-pub struct String6<X>(pub String, PhantomData<X>);
+pub struct String6<X>(pub String, pub PhantomData<X>);
 
 pub type IntPoint1 = Point<i64>;