Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tests to match new implementation #36

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions derive/common.t/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
{
tool_name = "ppx_driver";
include_dirs = [];
load_path = [];
hidden_include_dirs = [];
load_path = ([], []);
open_modules = [];
for_package = None;
debug = false;
Expand All @@ -52,34 +53,30 @@
include
struct
let _ = fun (_ : numbers) -> ()
let ( let* ) = Result.bind
let _ = ( let* )
let serialize_numbers =
let open Serde.Ser in fun t -> fun ctx -> (s (list int)) t ctx
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.Ser in fun t ctx -> (s (list int)) t ctx
let _ = serialize_numbers
open! Serde
let ( let* ) = Result.bind
let _ = ( let* )
let deserialize_numbers =
let ( let* ) = Result.bind in
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in let open Serde.De in fun ctx -> (d (list int)) ctx
let _ = deserialize_numbers
end[@@ocaml.doc "@inline"][@@merlin.hide ]
type number_list_list = numbers array[@@deriving (serialize, deserialize)]
include
struct
let _ = fun (_ : number_list_list) -> ()
let ( let* ) = Result.bind
let _ = ( let* )
let serialize_number_list_list =
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.Ser in
fun t -> fun ctx -> (s (array (s serialize_numbers))) t ctx
fun t ctx -> (s (array (s serialize_numbers))) t ctx
let _ = serialize_number_list_list
open! Serde
let ( let* ) = Result.bind
let _ = ( let* )
let deserialize_number_list_list =
let ( let* ) = Result.bind in
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.De in fun ctx -> (d (array (d deserialize_numbers))) ctx
let _ = deserialize_number_list_list
Expand Down
115 changes: 53 additions & 62 deletions derive/records.t/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
{
tool_name = "ppx_driver";
include_dirs = [];
load_path = [];
hidden_include_dirs = [];
load_path = ([], []);
open_modules = [];
for_package = None;
debug = false;
Expand All @@ -98,25 +99,22 @@
include
struct
let _ = fun (_ : rank) -> ()
let ( let* ) = Result.bind
let _ = ( let* )
let serialize_rank =
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.Ser in
fun t ->
fun ctx ->
record ctx "rank" 2
(fun ctx ->
let* () =
field ctx "rank_scores" ((s (list string)) t.rank_scores)
in
let* () = field ctx "rank_name" (string t.rank_name)
in Ok ())
fun t ctx ->
record ctx "rank" 2
(fun ctx ->
let* () =
field ctx "rank_scores" ((s (list string)) t.rank_scores)
in
let* () = field ctx "rank_name" (string t.rank_name)
in Ok ())
let _ = serialize_rank
open! Serde
let ( let* ) = Result.bind
let _ = ( let* )
let deserialize_rank =
let ( let* ) = Result.bind in
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.De in
fun ctx ->
Expand Down Expand Up @@ -153,13 +151,13 @@
let* () = read_fields ()
in
let* rank_scores =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg
"missing field \"rank_scores\" (\"rank_scores\")")
(!rank_scores)
in
let* rank_name =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg "missing field \"rank_name\" (\"rank_name\")")
(!rank_name)
in Ok { rank_name; rank_scores })
Expand All @@ -179,36 +177,32 @@
include
struct
let _ = fun (_ : t) -> ()
let ( let* ) = Result.bind
let _ = ( let* )
let serialize_t =
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.Ser in
fun t ->
fun ctx ->
record ctx "t" 8
(fun ctx ->
let* () = field ctx "name" (string t.name)
in
let* () = field ctx "commisioned" (bool t.commisioned)
in
let* () = field ctx "updated_at" (int64 t.updated_at)
in
let* () = field ctx "credits" ((s (option int32)) t.credits)
in
let* () =
field ctx "keywords" ((s (array string)) t.keywords)
in
let* () = field ctx "rank" ((s serialize_rank) t.rank)
in
let* () = field ctx "value" (float t.value)
in let* () = field ctx "type" (string t.type_)
in Ok ())
fun t ctx ->
record ctx "t" 8
(fun ctx ->
let* () = field ctx "name" (string t.name)
in
let* () = field ctx "commisioned" (bool t.commisioned)
in
let* () = field ctx "updated_at" (int64 t.updated_at)
in
let* () = field ctx "credits" ((s (option int32)) t.credits)
in
let* () = field ctx "keywords" ((s (array string)) t.keywords)
in
let* () = field ctx "rank" ((s serialize_rank) t.rank)
in
let* () = field ctx "value" (float t.value)
in let* () = field ctx "type" (string t.type_)
in Ok ())
let _ = serialize_t
open! Serde
let ( let* ) = Result.bind
let _ = ( let* )
let deserialize_t =
let ( let* ) = Result.bind in
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.De in
fun ctx ->
Expand Down Expand Up @@ -281,41 +275,41 @@
let* () = read_fields ()
in
let* name =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg "missing field \"name\" (\"name\")") (
!name)
in
let* commisioned =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg
"missing field \"commisioned\" (\"commisioned\")")
(!commisioned)
in
let* updated_at =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg
"missing field \"updated_at\" (\"updated_at\")")
(!updated_at)
in
let credits =
match !credits with | Some opt -> opt | None -> None in
let* keywords =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg "missing field \"keywords\" (\"keywords\")")
(!keywords)
in
let* rank =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg "missing field \"rank\" (\"rank\")") (
!rank)
in
let* value =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg "missing field \"value\" (\"value\")")
(!value)
in
let* type_ =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg "missing field \"type\" (\"type_\")") (
!type_)
in
Expand All @@ -337,23 +331,20 @@
include
struct
let _ = fun (_ : t_list) -> ()
let ( let* ) = Result.bind
let _ = ( let* )
let serialize_t_list =
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.Ser in
fun t ->
fun ctx ->
record ctx "t_list" 1
(fun ctx ->
let* () =
field ctx "stuff" ((s (list (s serialize_t))) t.stuff)
in Ok ())
fun t ctx ->
record ctx "t_list" 1
(fun ctx ->
let* () =
field ctx "stuff" ((s (list (s serialize_t))) t.stuff)
in Ok ())
let _ = serialize_t_list
open! Serde
let ( let* ) = Result.bind
let _ = ( let* )
let deserialize_t_list =
let ( let* ) = Result.bind in
let ( let* ) = Stdlib.Result.bind in
let _ = ( let* ) in
let open Serde.De in
fun ctx ->
Expand Down Expand Up @@ -382,7 +373,7 @@
let* () = read_fields ()
in
let* stuff =
Option.to_result
Stdlib.Option.to_result
~none:(`Msg "missing field \"stuff\" (\"stuff\")")
(!stuff)
in Ok { stuff })
Expand Down
Loading
Loading