From 62b7689d0af62daee569e7d8ab3c641af756e6ef Mon Sep 17 00:00:00 2001 From: Adelyn Breelove Date: Mon, 4 Feb 2019 13:21:52 -0700 Subject: Update yojson to 1.6.0 --- lib/models/channel/channel_t.ml | 2 +- lib/models/channel/channel_t.mli | 2 +- lib/models/channel/message/reaction.mli | 2 +- lib/models/event_models.ml | 2 +- lib/models/snowflake.ml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/models') diff --git a/lib/models/channel/channel_t.ml b/lib/models/channel/channel_t.ml index b02fa31..1705bdf 100644 --- a/lib/models/channel/channel_t.ml +++ b/lib/models/channel/channel_t.ml @@ -1,6 +1,6 @@ open Core -exception Invalid_channel of Yojson.Safe.json +exception Invalid_channel of Yojson.Safe.t type group = { id: Channel_id_t.t; diff --git a/lib/models/channel/channel_t.mli b/lib/models/channel/channel_t.mli index 711b319..30c90a5 100644 --- a/lib/models/channel/channel_t.mli +++ b/lib/models/channel/channel_t.mli @@ -1,4 +1,4 @@ -exception Invalid_channel of Yojson.Safe.json +exception Invalid_channel of Yojson.Safe.t (** Represents a Group channel object. *) type group = { diff --git a/lib/models/channel/message/reaction.mli b/lib/models/channel/message/reaction.mli index 38343cb..20ab436 100644 --- a/lib/models/channel/message/reaction.mli +++ b/lib/models/channel/message/reaction.mli @@ -1,6 +1,6 @@ include module type of Reaction_t -(* val delete : Reaction_t.t -> Yojson.Safe.json Deferred.Or_error.t +(* val delete : Reaction_t.t -> Yojson.Safe.t Deferred.Or_error.t val get_users : Reaction_t.t -> int -> User_t.t list Deferred.Or_error.t val get_users_after : Reaction_t.t -> Snowflake.t -> int -> User_t.t list Deferred.Or_error.t val get_users_before : Reaction_t.t -> Snowflake.t -> int -> User_t.t list Deferred.Or_error.t *) \ No newline at end of file diff --git a/lib/models/event_models.ml b/lib/models/event_models.ml index 4b27ec5..43717ee 100644 --- a/lib/models/event_models.ml +++ b/lib/models/event_models.ml @@ -340,7 +340,7 @@ end module Unknown = struct type t = { kind: string; - value: Yojson.Safe.json; + value: Yojson.Safe.t; } let deserialize kind value = { kind; value; } diff --git a/lib/models/snowflake.ml b/lib/models/snowflake.ml index 92c692c..2bf2281 100644 --- a/lib/models/snowflake.ml +++ b/lib/models/snowflake.ml @@ -8,7 +8,7 @@ let of_yojson d = try Ok (of_yojson_exn d) with Yojson.Safe.Util.Type_error (why,_) -> Error why -let to_yojson s : Yojson.Safe.json = `String (Int.to_string s) +let to_yojson s : Yojson.Safe.t = `String (Int.to_string s) let timestamp snowflake = (snowflake lsr 22) + 1_420_070_400_000 -- cgit v1.2.3