Merge pull request #2553 from BuckleScript/remove_refmt_v2

remove refmt version 2

Author: bobzhang

jscomp/bsb/bsb_config_parse.ml

@@ -165,9 +165,8 @@ let interpret_json
       match String_map.find_opt Bsb_build_schemas.refmt map with 
       | Some (Flo {flo} as config) -> 
         begin match flo with 
-        | "2" -> Bsb_config_types.Refmt_v2
-        | "3" -> Refmt_v3
-        | _ -> Bsb_exception.config_error config "expect version 2 or 3"
+        | "3" -> Bsb_config_types.Refmt_v3
+        | _ -> Bsb_exception.config_error config "expect version 3 only"
         end
       | Some (Str {str}) 
         -> 

jscomp/bsb/bsb_config_types.ml

@@ -37,7 +37,6 @@ type reason_react_jsx = string option
 
 type refmt = 
   | Refmt_none
-  | Refmt_v2
   | Refmt_v3 
   | Refmt_custom of string 
 type t = 

jscomp/bsb/bsb_ninja_gen.ml

@@ -124,9 +124,6 @@ let output_ninja_and_namespace_map
         [|
           Bsb_ninja_global_vars.refmt, 
             (match refmt with 
-            | Refmt_v2 -> 
-              Bsb_log.warn "@{<warning>Warning:@} ReasonSyntax V2 is deprecated, please upgrade to V3.@.";
-              bsc_dir // "refmt.exe"
             | Refmt_none -> 
               Bsb_log.warn "@{<warning>Warning:@} refmt version missing. Please set it explicitly, since we may change the default in the future.@.";
               bsc_dir // "refmt.exe"

lib/Makefile

@@ -19,8 +19,6 @@ bsb.exe:  bsb.mli bsb.ml
 bsb_helper.exe:  bsb_helper.mli bsb_helper.ml
 	$(NATIVE) $(OCAMLOPT_FLAGS) unix.cmxa -w -a $^ -o $@
 
-refmt.exe: refmt_main.mli refmt_main.ml
-	$(NATIVE) -w -40-30 -no-alias-deps -I +compiler-libs ocamlcommon.cmxa $^ -o $@
 
 refmt3.exe: refmt_main3.mli refmt_main3.ml
 	$(NATIVE) -w -40-30 -no-alias-deps -I +compiler-libs ocamlcommon.cmxa $^ -o $@

lib/bsb.ml

@@ -10098,7 +10098,6 @@ type reason_react_jsx = string option
 
 type refmt = 
   | Refmt_none
-  | Refmt_v2
   | Refmt_v3 
   | Refmt_custom of string 
 type t = 
@@ -10730,9 +10729,8 @@ let interpret_json
       match String_map.find_opt Bsb_build_schemas.refmt map with 
       | Some (Flo {flo} as config) -> 
         begin match flo with 
-        | "2" -> Bsb_config_types.Refmt_v2
-        | "3" -> Refmt_v3
-        | _ -> Bsb_exception.config_error config "expect version 2 or 3"
+        | "3" -> Bsb_config_types.Refmt_v3
+        | _ -> Bsb_exception.config_error config "expect version 3 only"
         end
       | Some (Str {str}) 
         -> 
@@ -12496,9 +12494,6 @@ let output_ninja_and_namespace_map
         [|
           Bsb_ninja_global_vars.refmt, 
             (match refmt with 
-            | Refmt_v2 -> 
-              Bsb_log.warn "@{<warning>Warning:@} ReasonSyntax V2 is deprecated, please upgrade to V3.@.";
-              bsc_dir // "refmt.exe"
             | Refmt_none -> 
               Bsb_log.warn "@{<warning>Warning:@} refmt version missing. Please set it explicitly, since we may change the default in the future.@.";
               bsc_dir // "refmt.exe"