remove remaining refs to Ppx_deriving_json_runtime

Author: jchavarri

ppx/test/allow_any.t/prettify.ml

@@ -1,5 +1,3 @@
-(* open Ppx_deriving_json_runtime.Primitives *)
-
 type variant =
 | Other of Yojson.Basic.t [@allow_any]
 | Foo

ppx/test/allow_any_poly.t/prettify.ml

@@ -1,5 +1,3 @@
-(* open Ppx_deriving_json_runtime.Primitives *)
-
 type variant =
 [ `Other of Yojson.Basic.t [@allow_any]
 | `Foo

ppx/test/errors.t/run.t

@@ -10,31 +10,31 @@ $ ocamlopt -dsource _build/default/prettify.pp.ml
     "d": [ 123, [ 1.2, 2.3, 2.4 ], "i am here" ]
   }
   $ dune exec ./prettify.exe -- tag_as_string.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|expected ["A"] or ["Foo"] or ["B", _] or ["C", _, _] or ["D", { _ }] but got "A"|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|expected ["A"] or ["Foo"] or ["B", _] or ["C", _, _] or ["D", { _ }] but got "A"|})
   [2]
   $ dune exec ./prettify.exe -- wrong_core_type.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|expected int but got string: "i am a string"|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|expected int but got string: "i am a string"|})
   [2]
   $ dune exec ./prettify.exe -- wrong_core_type_wide.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|expected int but got string: "i am a v ... "|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|expected int but got string: "i am a v ... "|})
   [2]
   $ dune exec ./prettify.exe -- deep_culprit.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|expected string but got object: {"a": _, "foo": _, "b": _, "c": _, "d": _}|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|expected string but got object: {"a": _, "foo": _, "b": _, "c": _, "d": _}|})
   [2]
   $ dune exec ./prettify.exe -- wide_culprit.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|expected string but got array: [123, 234, 345, 123, 234, 345, 123, 234, ...]|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|expected string but got array: [123, 234, 345, 123, 234, 345, 123, 234, ...]|})
   [2]
   $ dune exec ./prettify.exe -- missing_field.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|expected field "b" but got {"a": _, "foo": _, "c": _, "d": _}|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|expected field "b" but got {"a": _, "foo": _, "c": _, "d": _}|})
   [2]
   $ dune exec ./prettify.exe -- unknown_tag.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|expected ["A"] or ["Foo"] or ["B", _] or ["C", _, _] or ["D", { _ }] but got ["Bar"]|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|expected ["A"] or ["Foo"] or ["B", _] or ["C", _, _] or ["D", { _ }] but got ["Bar"]|})
   [2]
   $ dune exec ./prettify.exe -- wrong_tag_payload.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|expected ["A"] or ["Foo"] or ["B", _] or ["C", _, _] or ["D", { _ }] but got ["B", 123, "booh"]|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|expected ["A"] or ["Foo"] or ["B", _] or ["C", _, _] or ["D", { _ }] but got ["B", 123, "booh"]|})
   [2]
   $ dune exec ./prettify.exe -- extra_field.json
-  Fatal error: exception Ppx_deriving_json_runtime.Of_json_error(Json_error {|did not expect field "bar" but got {"a": _, "foo": _, "bar": _, "b": _, "c": _, "d": _}|})
+  Fatal error: exception Melange_json.Of_json_error(Json_error {|did not expect field "bar" but got {"a": _, "foo": _, "bar": _, "b": _, "c": _, "d": _}|})
   [2]
 
 

src/native/melange_json.ml

@@ -8,7 +8,6 @@ type json = t
 
 let classify = Classify.classify
 let declassify = Classify.declassify
-
 let to_string t = Yojson.Basic.to_string t
 
 include Errors
@@ -25,15 +24,10 @@ let to_json : json to_json = fun x -> x
 let () =
   Printexc.register_printer (function
     | Of_json_error (Json_error str) ->
-        Some
-          (sprintf
-             "Ppx_deriving_json_runtime.Of_json_error(Json_error {|%s|})"
-             str)
+        Some (sprintf "Melange_json.Of_json_error(Json_error {|%s|})" str)
     | Of_json_error (Unexpected_variant str) ->
         Some
-          (sprintf
-             "Ppx_deriving_json_runtime.Of_json_error(Unexpected_variant \
-              {|%s|})"
+          (sprintf "Melange_json.Of_json_error(Unexpected_variant {|%s|})"
              str)
     | _ -> None)