tweak Belt_Id

Ideally (struct type xx include N end) should just generate N instead

Author: bobzhang

jscomp/others/belt_Id.ml

@@ -49,8 +49,7 @@ module MakeComparableU (M : sig
   end) =
 struct
   type identity
-  type t = M.t
-  let cmp = M.cmp
+  include M
 end
 
 module MakeComparable (M : sig
@@ -69,11 +68,11 @@ let comparableU
   (type key)
   ~cmp
   =
-  let module N = MakeComparableU(struct
+  (module MakeComparableU(struct
       type t = key
       let cmp = cmp
-    end) in
-  (module N : Comparable with type t = key)
+    end) 
+  : Comparable with type t = key)
 
 let comparable
   (type key)
@@ -101,9 +100,7 @@ module MakeHashableU (M : sig
   end) =
 struct
   type identity
-  type t = M.t
-  let hash = M.hash
-  let eq = M.eq
+  include M
 end
 
 module MakeHashable (M : sig
@@ -121,12 +118,11 @@ struct
 end
 
 let hashableU (type key) ~hash ~eq =
-  let module N = MakeHashableU(struct
-    type t = key
-    let hash = hash
-    let eq = eq
-  end) in
-  (module N : Hashable with type t = key)
+  (module MakeHashableU(struct
+       type t = key
+       let hash = hash
+       let eq = eq
+     end) : Hashable with type t = key)
 
 let hashable (type key) ~hash ~eq =
   let module N = MakeHashable(struct

lib/js/belt_Id.js

@@ -3,8 +3,7 @@
 var Curry = require("./curry.js");
 
 function MakeComparableU(M) {
-  var cmp = M[/* cmp */0];
-  return /* module */[/* cmp */cmp];
+  return /* module */[/* cmp */M[0]];
 }
 
 function MakeComparable(M) {
@@ -23,11 +22,9 @@ function comparable(cmp) {
 }
 
 function MakeHashableU(M) {
-  var hash = M[/* hash */0];
-  var eq = M[/* eq */1];
   return /* module */[
-          /* hash */hash,
-          /* eq */eq
+          /* hash */M[0],
+          /* eq */M[1]
         ];
 }