apply such changes

Author: bobzhang

Diff for: jscomp/test/ast_js_mapper_poly_test.js

@@ -4,7 +4,6 @@ var Mt = require("./mt.js");
 var $$Array = require("../../lib/js/array.js");
 var Block = require("../../lib/js/block.js");
 var Js_mapperRt = require("../../lib/js/js_mapperRt.js");
-var Js_primitive = require("../../lib/js/js_primitive.js");
 
 var suites = [/* [] */0];
 
@@ -57,7 +56,7 @@ function eqU(x, y) {
 function eqUOpt(x, y) {
   if (x !== undefined) {
     if (y !== undefined) {
-      return Js_primitive.valFromOption(x) === Js_primitive.valFromOption(y);
+      return x === y;
     } else {
       return false;
     }
@@ -106,7 +105,7 @@ function eqV(x, y) {
 function eqVOpt(x, y) {
   if (x !== undefined) {
     if (y !== undefined) {
-      return Js_primitive.valFromOption(x) === Js_primitive.valFromOption(y);
+      return x === y;
     } else {
       return false;
     }
@@ -249,7 +248,7 @@ eq("File \"ast_js_mapper_poly_test.ml\", line 89, characters 5-12", $$Array.map(
               undefined,
               undefined
             ], $$Array.map((function (x) {
-                    return Js_primitive.some(x);
+                    return x;
                   }), /* array */[
                   /* C0 */0,
                   /* C1 */1,

Diff for: jscomp/test/big_polyvar_test.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var Js_mapperRt = require("../../lib/js/js_mapperRt.js");
-var Js_primitive = require("../../lib/js/js_primitive.js");
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions.js");
 
 var jsMapperConstantArray = /* array */[
@@ -1218,7 +1217,7 @@ function tFromJs(param) {
 function eq(x, y) {
   if (x !== undefined) {
     if (y !== undefined) {
-      return Js_primitive.valFromOption(x) === Js_primitive.valFromOption(y);
+      return x === y;
     } else {
       return false;
     }

Diff for: jscomp/test/bs_list_test.js

@@ -5,7 +5,6 @@ var Caml_obj = require("../../lib/js/caml_obj.js");
 var Belt_List = require("../../lib/js/belt_List.js");
 var Belt_Array = require("../../lib/js/belt_Array.js");
 var Caml_int32 = require("../../lib/js/caml_int32.js");
-var Js_primitive = require("../../lib/js/js_primitive.js");
 var Caml_primitive = require("../../lib/js/caml_primitive.js");
 
 var suites = [/* [] */0];
@@ -804,7 +803,7 @@ eq("TAKE", Belt_List.take(/* :: */[
       ]
     ]);
 
-eq("TAKE", Belt_List.take(length_10_id, 8), Js_primitive.some(length_8_id));
+eq("TAKE", Belt_List.take(length_10_id, 8), length_8_id);
 
 eq("TAKE", Belt_List.take(length_10_id, 0), /* [] */0);
 
@@ -820,7 +819,7 @@ eq("DROP", Belt_List.drop(length_10_id, 8), /* :: */[
       ]
     ]);
 
-eq("DROP", Belt_List.drop(length_10_id, 0), Js_primitive.some(length_10_id));
+eq("DROP", Belt_List.drop(length_10_id, 0), length_10_id);
 
 eq("DROP", Belt_List.drop(length_8_id, -1), undefined);
 

Diff for: jscomp/test/bs_poly_map_test.js

@@ -7,7 +7,6 @@ var Belt_Set = require("../../lib/js/belt_Set.js");
 var Caml_obj = require("../../lib/js/caml_obj.js");
 var Belt_Array = require("../../lib/js/belt_Array.js");
 var Belt_MapDict = require("../../lib/js/belt_MapDict.js");
-var Js_primitive = require("../../lib/js/js_primitive.js");
 var Caml_primitive = require("../../lib/js/caml_primitive.js");
 var Array_data_util = require("./array_data_util.js");
 
@@ -119,15 +118,15 @@ var a2 = Belt_Map.remove(a1, 3);
 
 var a3 = Belt_Map.update(a2, 3, (function (k) {
         if (k !== undefined) {
-          return Js_primitive.some(k + 1 | 0);
+          return k + 1 | 0;
         } else {
           return 11;
         }
       }));
 
 var a4 = Belt_Map.update(a2, 3, (function (k) {
         if (k !== undefined) {
-          return Js_primitive.some(Js_primitive.valFromOption(k) + 1 | 0);
+          return k + 1 | 0;
         } else {
           return undefined;
         }
@@ -263,15 +262,15 @@ var match$1 = match[0];
 
 var match$2 = Belt_Map.get(v3, 10);
 
-b("File \"bs_poly_map_test.ml\", line 126, characters 4-11", match$2 !== undefined ? Js_primitive.valFromOption(match$2) === 11 : false);
+b("File \"bs_poly_map_test.ml\", line 126, characters 4-11", match$2 !== undefined ? match$2 === 11 : false);
 
 var match$3 = Belt_Map.get(v3, -10);
 
 b("File \"bs_poly_map_test.ml\", line 127, characters 4-11", match$3 === undefined);
 
 var match$4 = Belt_Map.get(v4, -10);
 
-b("File \"bs_poly_map_test.ml\", line 128, characters 4-11", match$4 !== undefined ? Js_primitive.valFromOption(match$4) === 0 : false);
+b("File \"bs_poly_map_test.ml\", line 128, characters 4-11", match$4 !== undefined ? match$4 === 0 : false);
 
 var map = Belt_Map.remove({
       cmp: Icmp[/* cmp */0],
@@ -287,7 +286,7 @@ var map$1 = Belt_Map.removeMany({
 
 b("File \"bs_poly_map_test.ml\", line 130, characters 4-11", Belt_MapDict.isEmpty(map$1.data));
 
-b("File \"bs_poly_map_test.ml\", line 131, characters 4-11", pres !== undefined ? Js_primitive.valFromOption(pres) === 5000 : false);
+b("File \"bs_poly_map_test.ml\", line 131, characters 4-11", pres !== undefined ? pres === 5000 : false);
 
 b("File \"bs_poly_map_test.ml\", line 132, characters 4-11", Belt_Array.eq(Belt_MapDict.keysToArray(match$1[0].data), Belt_Array.makeBy(5000, (function (i) {
                 return i;