diff options
| -rw-r--r-- | opam | 4 | ||||
| -rw-r--r-- | src/sail.ml | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -35,8 +35,8 @@ depends: [ "omd" "conf-gmp" "conf-zlib" - "base64" {< "3.0.0"} - "yojson" {<= "1.7.0"} + "base64" {>= "3.1.0"} + "yojson" {>= "1.6.0"} "pprint" ] available: [ocaml-version >= "4.06.1"] diff --git a/src/sail.ml b/src/sail.ml index 34fffd2e..75adcd9c 100644 --- a/src/sail.ml +++ b/src/sail.ml @@ -57,7 +57,7 @@ let lib = ref ([] : string list) let opt_interactive_script : string option ref = ref None (* Note: May cause a deprecated warning for json type, but this cannot be fixed without breaking Ubuntu 18.04 CI *) -let opt_config : Json.json option ref = ref None +let opt_config : Json.t option ref = ref None let opt_print_version = ref false let opt_target = ref None let opt_tofrominterp_output_dir : string option ref = ref None @@ -476,7 +476,7 @@ let target name out_name ast type_envs = (l, Type_check.replace_env (Type_check.Env.set_prover None (Type_check.env_of_tannot tannot)) tannot) in Marshal.to_string (Ast_util.map_defs_annot remove_prover ast, Type_check.Env.set_prover None type_envs) [Marshal.Compat_32] - |> B64.encode + |> Base64.encode_string |> output_string f; close_out f |