Fix some bugs in the rust printer

cryspen · Aug 17, 2023 · 4520fc6 · 4520fc6
1 parent e5b3552
commit 4520fc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/engine/lib/print_rust.ml b/engine/lib/print_rust.ml
@@ -335,7 +335,7 @@ module Raw = struct
   let pgeneric_param_kind span (pk : generic_param_kind) =
     let ( ! ) = pure span in
     match pk with
-    | GPLifetime _ -> (empty, !": '_")
+    | GPLifetime _ -> (empty, !": 'unk")
     | GPType { default = Some default } -> (empty, !" = " & pty span default)
     | GPType { default = None } -> (empty, empty)
     | GPConst { typ } -> (!"const ", !":" & pty span typ)
@@ -361,7 +361,7 @@ module Raw = struct
   let pgeneric_constraint span (p : generic_constraint) =
     let ( ! ) = pure span in
     match p with
-    | GCLifetime _ -> !"'_: '_"
+    | GCLifetime _ -> !"'unk: 'unk"
     | GCType { typ; implements } ->
         pty span typ & !":" & ptrait_ref span implements
 
@@ -433,6 +433,7 @@ module Raw = struct
             & pgeneric_params generics.params
             & pgeneric_constraints e.span generics.constraints
             & pvariant_body e.span variant
+            & if variant.is_record then !"" else !";"
         | Type { name; generics; variants : _ } ->
             !"enum "
             & !(Concrete_ident_view.to_definition_name name)

diff --git a/tests/attributes/src/lib.rs b/tests/attributes/src/lib.rs
@@ -1,8 +1,7 @@
 use hax_lib_macros::*;
+use serde::Deserialize;
 
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 pub struct SerdeTest {
     foo: u32,
 }