Revert "type s instead kind"

This reverts commit 7a8880b.

Author: mununki

jscomp/others/js_json.res

@@ -35,13 +35,13 @@ type rec t =
   | Array(array<t>)
 
 module Kind = {
-  type rec s<_> =
-    | String: s<Js_string.t>
-    | Number: s<float>
-    | Object: s<Js_dict.t<t>>
-    | Array: s<array<t>>
-    | Boolean: s<bool>
-    | Null: s<Js_types.null_val>
+  type rec kind<_> =
+    | String: kind<Js_string.t>
+    | Number: kind<float>
+    | Object: kind<Js_dict.t<t>>
+    | Array: kind<array<t>>
+    | Boolean: kind<bool>
+    | Null: kind<Js_types.null_val>
 }
 
 type tagged_t =
@@ -74,7 +74,7 @@ let classify = (x: t): tagged_t => {
   }
 }
 
-let test = (type a, x: 'a, v: Kind.s<a>): bool =>
+let test = (type a, x: 'a, v: Kind.kind<a>): bool =>
   switch v {
   | Kind.Number => Js.typeof(x) == "number"
   | Kind.Boolean => Js.typeof(x) == "boolean"

jscomp/others/js_json.resi

@@ -42,13 +42,13 @@ type rec t =
 
 module Kind: {
   /** Underlying type of a JSON value */
-  type rec s<_> =
-    | String: s<Js_string.t>
-    | Number: s<float>
-    | Object: s<Js_dict.t<t>>
-    | Array: s<array<t>>
-    | Boolean: s<bool>
-    | Null: s<Js_types.null_val>
+  type rec kind<_> =
+    | String: kind<Js_string.t>
+    | Number: kind<float>
+    | Object: kind<Js_dict.t<t>>
+    | Array: kind<array<t>>
+    | Boolean: kind<bool>
+    | Null: kind<Js_types.null_val>
 }
 
 type tagged_t =
@@ -65,7 +65,7 @@ type tagged_t =
 let classify: t => tagged_t
 
 /** `test(v, kind)` returns `true` if `v` is of `kind`. */
-let test: ('a, Kind.s<'b>) => bool
+let test: ('a, Kind.kind<'b>) => bool
 
 /** `decodeString(json)` returns `Some(s)` if `json` is a `string`, `None` otherwise. */
 let decodeString: t => option<Js_string.t>

jscomp/test/js_json_test.res

@@ -145,7 +145,7 @@ let () = {
 
 /* Check that the given json value is an array and that its element
  * a position [i] is equal to both the [kind] and [expected] value */
-let eq_at_i = (type a, loc: string, json: J.t, i: int, kind: J.Kind.s<a>, expected: a): unit => {
+let eq_at_i = (type a, loc: string, json: J.t, i: int, kind: J.Kind.kind<a>, expected: a): unit => {
   let ty = J.classify(json)
   switch ty {
   | J.JSONArray(x) =>