File tree Expand file tree Collapse file tree 4 files changed +7
-36
lines changed Expand file tree Collapse file tree 4 files changed +7
-36
lines changed Original file line number Diff line number Diff line change 18
18
- Remove unused ` -bs-D ` and ` -bs-list-conditionals ` flags. https://github.com/rescript-lang/rescript/pull/7631
19
19
- Remove obsolete jsx options. https://github.com/rescript-lang/rescript/pull/7633
20
20
- Remove obsolete option ` -bs-unsafe-empty-array ` . https://github.com/rescript-lang/rescript/pull/7635
21
+ - Clean up ` config.ml ` . https://github.com/rescript-lang/rescript/pull/7636
21
22
22
23
# 12.0.0-beta.1
23
24
Original file line number Diff line number Diff line change @@ -5,18 +5,14 @@ let tryReadCmt cmt =
5
5
else
6
6
match Cmt_format. read_cmt cmt with
7
7
| exception Cmi_format. Error err ->
8
- Log. log
9
- (" Failed to load " ^ cmt ^ " as a cmt w/ ocaml version " ^ " 406"
10
- ^ " , error: "
11
- ^
12
- (Cmi_format. report_error Format. str_formatter err;
13
- Format. flush_str_formatter () ));
8
+ let error_message =
9
+ Cmi_format. report_error Format. str_formatter err;
10
+ Format. flush_str_formatter ()
11
+ in
12
+ Log. log (" Invalid cmt format " ^ cmt ^ " : " ^ error_message);
14
13
None
15
14
| exception err ->
16
- Log. log
17
- (" Invalid cmt format " ^ cmt
18
- ^ " - probably wrong ocaml version, expected " ^ Config. version ^ " : "
19
- ^ Printexc. to_string err);
15
+ Log. log (" Invalid cmt format " ^ cmt ^ " : " ^ Printexc. to_string err);
20
16
None
21
17
| x -> Some x
22
18
Original file line number Diff line number Diff line change 1
- let version = " 4.06.1+BS"
2
-
3
1
(* This resolves the location of the standard library starting from the location of bsc.exe,
4
2
handling different supported package layouts. *)
5
3
let standard_library =
@@ -31,8 +29,6 @@ let standard_library =
31
29
| _ :: _ :: _ :: _ :: rest -> build_path rest [" lib" ; " ocaml" ]
32
30
| _ -> " "
33
31
34
- let standard_library_default = standard_library
35
-
36
32
let cmi_magic_number = " Caml1999I022"
37
33
38
34
and ast_impl_magic_number = " Caml1999M022"
@@ -42,20 +38,3 @@ and ast_intf_magic_number = "Caml1999N022"
42
38
and cmt_magic_number = " Caml1999T022"
43
39
44
40
let load_path = ref ([] : string list )
45
-
46
- (* This is normally the same as in obj.ml, but we have to define it
47
- separately because it can differ when we're in the middle of a
48
- bootstrapping phase. *)
49
-
50
- let print_config oc =
51
- let p name valu = Printf. fprintf oc " %s: %s\n " name valu in
52
- p " version" version;
53
- p " standard_library_default" standard_library_default;
54
- p " standard_library" standard_library;
55
-
56
- (* print the magic number *)
57
- p " cmi_magic_number" cmi_magic_number;
58
- p " ast_impl_magic_number" ast_impl_magic_number;
59
- p " ast_intf_magic_number" ast_intf_magic_number;
60
- p " cmt_magic_number" cmt_magic_number;
61
- flush oc
Original file line number Diff line number Diff line change 15
15
16
16
(* System configuration *)
17
17
18
- val version : string
19
- (* The current version number of the system *)
20
-
21
18
val standard_library : string
22
19
(* The directory containing the standard libraries *)
23
20
@@ -35,5 +32,3 @@ val ast_impl_magic_number : string
35
32
(* Magic number for file holding an implementation syntax tree *)
36
33
val cmt_magic_number : string
37
34
(* Magic number for compiled interface files *)
38
-
39
- val print_config : out_channel -> unit
You can’t perform that action at this time.
0 commit comments