Skip to content

Commit fb9e9b2

Browse files
bobzhangbobzhang
committed
disable -strict-sequence/ replace it with warning 10 and error
such migration is smoother
1 parent f24fd37 commit fb9e9b2

File tree

9 files changed

+22
-15
lines changed

9 files changed

+22
-15
lines changed

‎jscomp/bsb/bsb_merlin_gen.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ let output_merlin_namespace buffer ns=
8989
let bsc_flg_to_merlin_ocamlc_flg bsc_flags =
9090
merlin_flg ^
9191
String.concat Ext_string.single_space
92-
("-strict-sequence" :: List.filter (fun x -> not (Ext_string.starts_with x bs_flg_prefix )) (
92+
(List.filter (fun x -> not (Ext_string.starts_with x bs_flg_prefix )) (
9393
Literals.dash_nostdlib::bsc_flags))
9494

9595
(* No need for [-warn-error] in merlin *)

‎jscomp/core/bs_conditional_initial.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ let setup_env () =
3838
Clflags.debug := true;
3939
Clflags.record_event_when_debug := false;
4040
Clflags.binary_annotations := true;
41-
Clflags.strict_sequence := true;
41+
(* Clflags.strict_sequence := true; *)
4242
(* Turn on [-no-alias-deps] by default -- double check *)
4343
Oprint.out_ident := Outcome_printer_ns.out_ident;
4444
Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;

‎jscomp/ext/bsc_warnings.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@
7272
7373
- 102 Bs_polymorphic_comparison
7474
*)
75-
let defaults_w = "+a-4-40-41-42-50-102"
75+
let defaults_w = "+a-4-9-40-41-42-50-102"
7676
let defaults_warn_error = "-a+5+101";;
77+
(*TODO: add +10*)

‎lib/4.06.1/bsb.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6964,8 +6964,9 @@ module Bsc_warnings
69646964

69656965
- 102 Bs_polymorphic_comparison
69666966
*)
6967-
let defaults_w = "+a-4-40-41-42-50-102"
6967+
let defaults_w = "+a-4-9-40-41-42-50-102"
69686968
let defaults_warn_error = "-a+5+101";;
6969+
(*TODO: add +10*)
69696970

69706971
end
69716972
module Bsb_warning : sig
@@ -11785,7 +11786,7 @@ let output_merlin_namespace buffer ns=
1178511786
let bsc_flg_to_merlin_ocamlc_flg bsc_flags =
1178611787
merlin_flg ^
1178711788
String.concat Ext_string.single_space
11788-
("-strict-sequence" :: List.filter (fun x -> not (Ext_string.starts_with x bs_flg_prefix )) (
11789+
(List.filter (fun x -> not (Ext_string.starts_with x bs_flg_prefix )) (
1178911790
Literals.dash_nostdlib::bsc_flags))
1179011791

1179111792
(* No need for [-warn-error] in merlin *)

‎lib/4.06.1/bsdep.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ module Bsc_warnings
138138

139139
- 102 Bs_polymorphic_comparison
140140
*)
141-
let defaults_w = "+a-4-40-41-42-50-102"
141+
let defaults_w = "+a-4-9-40-41-42-50-102"
142142
let defaults_warn_error = "-a+5+101";;
143+
(*TODO: add +10*)
143144

144145
end
145146
module Arg_helper : sig
@@ -28224,7 +28225,7 @@ let setup_env () =
2822428225
Clflags.debug := true;
2822528226
Clflags.record_event_when_debug := false;
2822628227
Clflags.binary_annotations := true;
28227-
Clflags.strict_sequence := true;
28228+
(* Clflags.strict_sequence := true; *)
2822828229
(* Turn on [-no-alias-deps] by default -- double check *)
2822928230
Oprint.out_ident := Outcome_printer_ns.out_ident;
2823028231
Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;

‎lib/4.06.1/unstable/bsb_native.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6964,8 +6964,9 @@ module Bsc_warnings
69646964

69656965
- 102 Bs_polymorphic_comparison
69666966
*)
6967-
let defaults_w = "+a-4-40-41-42-50-102"
6967+
let defaults_w = "+a-4-9-40-41-42-50-102"
69686968
let defaults_warn_error = "-a+5+101";;
6969+
(*TODO: add +10*)
69696970

69706971
end
69716972
module Bsb_warning : sig
@@ -11892,7 +11893,7 @@ let output_merlin_namespace buffer ns=
1189211893
let bsc_flg_to_merlin_ocamlc_flg bsc_flags =
1189311894
merlin_flg ^
1189411895
String.concat Ext_string.single_space
11895-
("-strict-sequence" :: List.filter (fun x -> not (Ext_string.starts_with x bs_flg_prefix )) (
11896+
(List.filter (fun x -> not (Ext_string.starts_with x bs_flg_prefix )) (
1189611897
Literals.dash_nostdlib::bsc_flags))
1189711898

1189811899
(* No need for [-warn-error] in merlin *)

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25534,8 +25534,9 @@ module Bsc_warnings
2553425534

2553525535
- 102 Bs_polymorphic_comparison
2553625536
*)
25537-
let defaults_w = "+a-4-40-41-42-50-102"
25537+
let defaults_w = "+a-4-9-40-41-42-50-102"
2553825538
let defaults_warn_error = "-a+5+101";;
25539+
(*TODO: add +10*)
2553925540

2554025541
end
2554125542
module Ident : sig
@@ -76459,7 +76460,7 @@ let setup_env () =
7645976460
Clflags.debug := true;
7646076461
Clflags.record_event_when_debug := false;
7646176462
Clflags.binary_annotations := true;
76462-
Clflags.strict_sequence := true;
76463+
(* Clflags.strict_sequence := true; *)
7646376464
(* Turn on [-no-alias-deps] by default -- double check *)
7646476465
Oprint.out_ident := Outcome_printer_ns.out_ident;
7646576466
Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;

‎lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304639,8 +304639,9 @@ module Bsc_warnings
304639304639

304640304640
- 102 Bs_polymorphic_comparison
304641304641
*)
304642-
let defaults_w = "+a-4-40-41-42-50-102"
304642+
let defaults_w = "+a-4-9-40-41-42-50-102"
304643304643
let defaults_warn_error = "-a+5+101";;
304644+
(*TODO: add +10*)
304644304645

304645304646
end
304646304647
module Ident : sig
@@ -355564,7 +355565,7 @@ let setup_env () =
355564355565
Clflags.debug := true;
355565355566
Clflags.record_event_when_debug := false;
355566355567
Clflags.binary_annotations := true;
355567-
Clflags.strict_sequence := true;
355568+
(* Clflags.strict_sequence := true; *)
355568355569
(* Turn on [-no-alias-deps] by default -- double check *)
355569355570
Oprint.out_ident := Outcome_printer_ns.out_ident;
355570355571
Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;

‎lib/4.06.1/whole_compiler.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6375,8 +6375,9 @@ module Bsc_warnings
63756375

63766376
- 102 Bs_polymorphic_comparison
63776377
*)
6378-
let defaults_w = "+a-4-40-41-42-50-102"
6378+
let defaults_w = "+a-4-9-40-41-42-50-102"
63796379
let defaults_warn_error = "-a+5+101";;
6380+
(*TODO: add +10*)
63806381

63816382
end
63826383
(** Interface as module *)
@@ -62729,7 +62730,7 @@ let setup_env () =
6272962730
Clflags.debug := true;
6273062731
Clflags.record_event_when_debug := false;
6273162732
Clflags.binary_annotations := true;
62732-
Clflags.strict_sequence := true;
62733+
(* Clflags.strict_sequence := true; *)
6273362734
(* Turn on [-no-alias-deps] by default -- double check *)
6273462735
Oprint.out_ident := Outcome_printer_ns.out_ident;
6273562736
Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;

0 commit comments

Comments
 (0)