replace -bs-quiet with -w a

Author: bobzhang

jscomp/bsb/bsb_ninja_gen.ml

@@ -36,11 +36,10 @@ let dash_i = "-I"
 
 
 let get_bsc_flags 
-    ~(toplevel : bool)     
     (bsc_flags : string list)
   : string =       
-  String.concat Ext_string.single_space 
-    (if toplevel then bsc_flags else "-bs-quiet" :: bsc_flags )
+  String.concat Ext_string.single_space bsc_flags
+
 
 
 let emit_bsc_lib_includes 
@@ -160,7 +159,7 @@ let output_ninja_and_namespace_map
         (* The path to [bsb_heler.exe] *)
         Bsb_ninja_global_vars.bsdep, (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep) ;
         Bsb_ninja_global_vars.warnings, Bsb_warning.to_bsb_string ~toplevel warning ;
-        Bsb_ninja_global_vars.bsc_flags, (get_bsc_flags ~toplevel  bsc_flags) ;
+        Bsb_ninja_global_vars.bsc_flags, (get_bsc_flags bsc_flags) ;
         Bsb_ninja_global_vars.ppx_flags, ppx_flags;
 
         Bsb_ninja_global_vars.g_dpkg_incls, 

jscomp/bsb/bsb_warning.ml

@@ -86,23 +86,26 @@ let from_map (m : Ext_json_types.t Map_string.t) =
     in
     Some {number; error }
 
-let to_bsb_string ~toplevel warning =
-  match warning with
-  | None -> Ext_string.empty
-  | Some warning ->     
-    (match warning.number with
-     | None ->
-       Ext_string.empty
-     | Some x ->
-       prepare_warning_concat ~beg:true x  
-    ) ^
-    if toplevel then 
-      match warning.error with
-      | Warn_error_true ->
-        " -warn-error A"
-      | Warn_error_number y ->
-        " -warn-error " ^ y
-      | Warn_error_false ->
-        Ext_string.empty
-    else Ext_string.empty     
 
+let to_bsb_string ~toplevel warning =
+  if toplevel then
+    match warning with
+    | None -> Ext_string.empty
+    | Some warning ->     
+      (match warning.number with
+       | None ->
+         Ext_string.empty
+       | Some x ->
+         prepare_warning_concat ~beg:true x  
+      ) ^
+      (
+        match warning.error with
+        | Warn_error_true ->
+          " -warn-error A"
+        | Warn_error_number y ->
+          " -warn-error " ^ y
+        | Warn_error_false ->
+          Ext_string.empty
+      )
+  else " -w a" 
+  (* TODO: this is the current default behavior *)

jscomp/core/bs_conditional_initial.ml

@@ -51,12 +51,12 @@ let setup_env () =
     Matching_polyfill.names_from_construct_pattern;
 #if undefined BS_RELEASE_BUILD then
     Printexc.record_backtrace true;
-    (match Ext_sys.getenv_opt "BS_DEBUG_FILE" with 
+    (match Sys.getenv_opt "BS_DEBUG_FILE" with 
      | None -> ()       
      | Some s -> 
        Js_config.set_debug_file s 
     );
-    (if Ext_sys.getenv_opt "BS_DEBUG_CHROME" <> None then 
+    (if Sys.getenv_opt "BS_DEBUG_CHROME" <> None then 
       Js_config.debug := true);
 #end
   Lexer.replace_directive_bool "BS" true;

jscomp/core/lam_arity.ml

@@ -63,7 +63,7 @@ let print_arities_tbl
     (fmt : Format.formatter) 
     (arities_tbl : (Ident.t, t ref) Hashtbl.t) = 
   Hashtbl.fold (fun (i:Ident.t) (v : t ref) _ -> 
-      pp Format.err_formatter "@[%s -> %a@]@."i.name print !v ) arities_tbl ()
+      pp fmt "@[%s -> %a@]@."i.name print !v ) arities_tbl ()
 
 
 

jscomp/core/lam_compat.ml

@@ -116,7 +116,7 @@ type bigarray_kind = Lambda.bigarray_kind =
   | Pbigarray_complex32 | Pbigarray_complex64
 
 
-let eq_bigarray_kind (p : bigarray_kind) (p1 : bigarray_kind) = 
+(* let eq_bigarray_kind (p : bigarray_kind) (p1 : bigarray_kind) = 
   match p with   
   | Pbigarray_unknown -> p1 = Pbigarray_unknown
   | Pbigarray_float32 -> p1 = Pbigarray_float32
@@ -130,7 +130,7 @@ let eq_bigarray_kind (p : bigarray_kind) (p1 : bigarray_kind) =
   | Pbigarray_caml_int -> p1 = Pbigarray_caml_int
   | Pbigarray_native_int -> p1 = Pbigarray_native_int
   | Pbigarray_complex32  -> p1 = Pbigarray_complex32
-  | Pbigarray_complex64 -> p1 = Pbigarray_complex64
+  | Pbigarray_complex64 -> p1 = Pbigarray_complex64 *)
 
 
 type bigarray_layout = Lambda.bigarray_layout = 
@@ -141,11 +141,11 @@ type bigarray_layout = Lambda.bigarray_layout =
 
 
 
-let eq_bigarray_layout (p : bigarray_layout) (p1 : bigarray_layout) = 
+(* let eq_bigarray_layout (p : bigarray_layout) (p1 : bigarray_layout) = 
   match p with 
   | Pbigarray_unknown_layout -> p1 = Pbigarray_unknown_layout
   | Pbigarray_c_layout -> p1 = Pbigarray_c_layout
-  | Pbigarray_fortran_layout -> p1 = Pbigarray_fortran_layout  
+  | Pbigarray_fortran_layout -> p1 = Pbigarray_fortran_layout   *)
 
 type compile_time_constant = Lambda.compile_time_constant = 
     | Big_endian
@@ -191,8 +191,8 @@ let str_of_field_info (x : field_dbg_info) : string option =
   | Fld_poly_var_content
   | Fld_tuple 
   | Fld_extension_slot -> None   
-  | Fld_record {name } 
-  | Fld_module {name}
+  | Fld_record {name ; _} 
+  | Fld_module {name ; _}
   | Fld_record_inline {name}
   | Fld_record_extension {name}
      -> 

jscomp/core/lam_compile_util.ml

@@ -65,7 +65,7 @@ let comment_of_tag_info  (x : Lam_tag_info.t) =
 let module_alias = Some "alias"  
 let comment_of_pointer_info (x :  Lam_pointer_info.t)= 
   match x with 
-  | Pt_constructor {name}
+  | Pt_constructor {name;_}
   | Pt_variant {name} -> Some name
   | Pt_module_alias -> module_alias
   | Pt_na -> None

jscomp/core/matching_polyfill.ml

@@ -40,17 +40,17 @@ let names_from_construct_pattern (pat: Typedtree.pattern) =
           blocks = Ext_array.reverse_of_list blocks } in
   let rec resolve_path n (path : Path.t) =
     match Env.find_type path pat.pat_env with
-    | {type_kind = Type_variant cstrs} ->
+    | {type_kind = Type_variant cstrs;_} ->
       names_from_type_variant cstrs
-    | {type_kind = Type_abstract; type_manifest = Some t} ->
+    | {type_kind = Type_abstract; type_manifest = Some t;_} ->
       ( match (Ctype.unalias t).desc with
         | Tconstr (pathn, _, _) ->
           (* Format.eprintf "XXX path%d:%s path%d:%s@." n (Path.name path) (n+1) (Path.name pathn); *)
           resolve_path (n+1) pathn
         | _ -> None)
-    | {type_kind = Type_abstract; type_manifest = None} ->
+    | {type_kind = Type_abstract; type_manifest = None;_} ->
       None
-    | {type_kind = Type_record _ | Type_open (* Exceptions *) } ->          
+    | {type_kind = Type_record _ | Type_open (* Exceptions *) ;_} ->          
       None in
 
   match (Btype.repr pat.pat_type).desc with

jscomp/core/ocaml_options.ml

@@ -16,9 +16,9 @@ let mk_absname f =
   "-absname", Arg.Unit f, " Show absolute filenames in error messages"
 ;;
 
-let mk_annot f =
+(* let mk_annot f =
   "-annot", Arg.Unit f, " Save information in <filename>.annot"
-;;
+;; *)
 
 let mk_binannot f =
   "-bin-annot", Arg.Unit f, " Save typedtree in <filename>.cmt"
@@ -32,9 +32,9 @@ let mk_config f =
   "-config", Arg.Unit f, " Print configuration values and exit"
 ;;
 
-let mk_g_byt f =
+(* let mk_g_byt f =
   "-g", Arg.Unit f, " Save debugging information"
-;;
+;; *)
 
 let mk_i f =
   "-i", Arg.Unit f, " Print inferred interface"
@@ -78,9 +78,9 @@ let mk_no_app_funct f =
   "-no-app-funct", Arg.Unit f, " Deactivate applicative functors"
 ;;
 
-let mk_no_check_prims f =
+(* let mk_no_check_prims f =
   "-no-check-prims", Arg.Unit f, " Do not check runtime for primitives"
-;;
+;; *)
 
 let mk_noassert f =
   "-noassert", Arg.Unit f, " Do not compile assertion checks"
@@ -119,17 +119,17 @@ let mk_rectypes f =
   "-rectypes", Arg.Unit f, " Allow arbitrary recursive types"
 ;;
 
-let mk_safe_string f =
+(* let mk_safe_string f =
   "-safe-string", Arg.Unit f, " Make strings immutable"
-;;
+;; *)
 
 let mk_short_paths f =
   "-short-paths", Arg.Unit f, " Shorten paths in types"
 ;;
 
-let mk_stdin f =
+(* let mk_stdin f =
   "-stdin", Arg.Unit f, " Read script from standard input"
-;;
+;; *)
 
 let mk_strict_sequence f =
   "-strict-sequence", Arg.Unit f,
@@ -226,11 +226,11 @@ let mk_dlambda f =
   "-dlambda", Arg.Unit f, " (undocumented)"
 ;;
 
-let mk_opaque f =
+(* let mk_opaque f =
   "-opaque", Arg.Unit f,
   " Does not generate cross-module optimization information\n\
   \     (reduces necessary recompilation on module change)"
-;;
+;; *)
 
 let mk_strict_formats f =
   "-strict-formats", Arg.Unit f,