Skip to content

Update to use Yojson 1.6 t type #30

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to use Yojson 1.6 t type #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
(>= v0.13.0))
uuidm
uri
yojson))
(yojson
(>= 1.6.0))))
2 changes: 1 addition & 1 deletion sentry.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ depends: [
"sexplib" {>= "v0.13.0"}
"uuidm"
"uri"
"yojson"
"yojson" {>= "1.6.0"}
]
build: [
["dune" "subst"] {pinned}
Expand Down
4 changes: 2 additions & 2 deletions src/json.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
type t = Yojson.Basic.json
type t = Yojson.Basic.t

let sexp_of_t (t : Yojson.Basic.json) =
let sexp_of_t (t : Yojson.Basic.t) =
Json_derivers.Yojson.sexp_of_t (t :> Json_derivers.Yojson.t)
;;
4 changes: 2 additions & 2 deletions src/json.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(** Wrapper for Yojson.Basic.json with sexp_of *)
type t = Yojson.Basic.json [@@deriving sexp_of]
(** Wrapper for Yojson.Basic.t with sexp_of *)
type t = Yojson.Basic.t [@@deriving sexp_of]
6 changes: 3 additions & 3 deletions src/payloads.atd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type json <ocaml module="Yojson.Basic"> = abstract
type t <ocaml module="Yojson.Basic"> = abstract

type capped_string_4k = string wrap <ocaml module="Capped_string_4k">
type capped_string_512 = string wrap <ocaml module="Capped_string_512">
Expand Down Expand Up @@ -59,7 +59,7 @@ type breadcrumb =
{ timestamp : datetime
; ?type_ <json name="type"> : capped_string_512 nullable
; ?message : capped_string_512 nullable
; ?data : (capped_string_512 * json) list <json repr="object"> nullable
; ?data : (capped_string_512 * t) list <json repr="object"> nullable
; ?category : capped_string_512 nullable
; ?level : capped_string_512 nullable }

Expand All @@ -76,7 +76,7 @@ type event =
; ?tags : (capped_string_512 * capped_string_512) list <json repr="object"> nullable
; ?environment : capped_string_512 nullable
; ?modules : (capped_string_512 * capped_string_512) list <json repr="object"> nullable
; ?extra : (capped_string_512 * json) list <json repr="object"> nullable
; ?extra : (capped_string_512 * t) list <json repr="object"> nullable
; ?fingerprint : capped_string_512 list nullable
; ?exception_ <json name="exception"> : exception_ nullable
; ?message <json name="sentry.interfaces.Message"> : message nullable
Expand Down