Skip to content

Remove old .ml tests. #6847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
- Remove coercion with 2 types from internal representation. Coercion `e : t1 :> t2` was only supported in `.ml` syntax and never by the `.res` parser. https://github.com/rescript-lang/rescript-compiler/pull/6829
- Convert `caml_format` and `js_math` to `.res`. https://github.com/rescript-lang/rescript-compiler/pull/6834
- Convert `js.ml` files to `.res`. https://github.com/rescript-lang/rescript-compiler/pull/6835
- Remove old `.ml` tests. https://github.com/rescript-lang/rescript-compiler/pull/6847

#### :nail_care: Polish

Expand Down
3 changes: 0 additions & 3 deletions jscomp/bsc/rescript_compiler_main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,6 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
"-bs-list-conditionals", unit_call (fun () -> Pp.list_variables Format.err_formatter),
"*internal* List existing conditional variables";

"-bs-eval", string_call (fun s -> eval s ~suffix:Literals.suffix_ml),
"*internal* (experimental) set the string to be evaluated in OCaml syntax";

"-e", string_call (fun s -> eval s ~suffix:Literals.suffix_res),
"(experimental) set the string to be evaluated in ReScript syntax";

Expand Down
60 changes: 0 additions & 60 deletions jscomp/build_tests/cmd/input.js

This file was deleted.

2 changes: 0 additions & 2 deletions jscomp/ext/config.ml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ and cmt_magic_number = "Caml1999T022"

let load_path = ref ([] : string list)

let interface_suffix = ref ".mli"

(* This is normally the same as in obj.ml, but we have to define it
separately because it can differ when we're in the middle of a
bootstrapping phase. *)
Expand Down
3 changes: 0 additions & 3 deletions jscomp/ext/config.mli
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ val unsafe_empty_array : bool ref
val load_path : string list ref
(* Directories in the search path for .cmi and .cmo files *)

val interface_suffix : string ref
(* Suffix for interface file names *)

val cmi_magic_number : string

(* Magic number for compiled interface files *)
Expand Down
2 changes: 1 addition & 1 deletion jscomp/ext/ext_file_extensions.ml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type valid_input =
let classify_input ext =
match () with
| _ when ext = Literals.suffix_ml -> Ml
| _ when ext = !Config.interface_suffix -> Mli
| _ when ext = Literals.suffix_mli -> Mli
| _ when ext = Literals.suffix_ast -> Impl_ast
| _ when ext = Literals.suffix_iast -> Intf_ast
| _ when ext = Literals.suffix_mlmap -> Mlmap
Expand Down
4 changes: 2 additions & 2 deletions jscomp/ml/typemod.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1688,14 +1688,14 @@ let type_implementation_more ?check_exists sourcefile outputprefix modulename in
type_structure initial_env ast (Location.in_file sourcefile) in
let simple_sg = simplify_signature sg in
begin
let sourceintf =
Filename.remove_extension sourcefile ^ !Config.interface_suffix in
let mli_status = !Clflags.assume_no_mli in
if mli_status = Clflags.Mli_exists then begin
let intf_file =
try
find_in_path_uncap !Config.load_path (modulename ^ ".cmi")
with Not_found ->
let sourceintf =
Filename.remove_extension sourcefile ^ Literals.suffix_resi in
raise(Error(Location.in_file sourcefile, Env.empty,
Interface_not_compiled sourceintf)) in
let dclsig = Env.read_signature modulename intf_file in
Expand Down
Loading