diff --git a/ocaml/Makefile.common-jst b/ocaml/Makefile.common-jst index 507e2fe8292..398bcf37855 100644 --- a/ocaml/Makefile.common-jst +++ b/ocaml/Makefile.common-jst @@ -251,15 +251,15 @@ install_for_test: _install ln -s . lex; ln -s . yacc; \ ln -s _install/lib/ocaml/compiler-libs compilerlibs; \ mkdir -p otherlibs/{unix,dynlink/native,str,bigarray,runtime_events}; \ - mkdir -p otherlibs/{upstream_compatible,stable,beta,alpha}; \ ln -s ../stdlib/threads otherlibs/systhreads$(RUNTIME_SUFFIX); \ $(cpl) stdlib/unix/{lib,}unix* otherlibs/unix; \ $(cpl) stdlib/dynlink/dynlink* otherlibs/dynlink; \ $(cpl) stdlib/str/{lib,}str* otherlibs/str; \ - $(cpl) stdlib/upstream_compatible/* otherlibs/upstream_compatible; \ - $(cpl) stdlib/stable/* otherlibs/stable; \ - $(cpl) stdlib/beta/* otherlibs/beta; \ - $(cpl) stdlib/alpha/* otherlibs/alpha; \ + for universe in upstream_compatible stable beta alpha ; do \ + mkdir -p otherlibs/{stdlib_,}$${universe}; \ + $(cpl) stdlib/stdlib_$${universe}/* otherlibs/stdlib_$${universe}; \ + $(cpl) stdlib/$${universe}/* otherlibs/$${universe}; \ + done; \ if [[ x"$(RUNTIME_DIR)" = x"runtime" ]]; then \ $(cpl) stdlib/runtime_events/{lib,}runtime_events* otherlibs/runtime_events; \ fi; \ diff --git a/ocaml/ocamltest/ocaml_modifiers.ml b/ocaml/ocamltest/ocaml_modifiers.ml index e7a0ea2151d..24859c5e6bc 100644 --- a/ocaml/ocamltest/ocaml_modifiers.ml +++ b/ocaml/ocamltest/ocaml_modifiers.ml @@ -93,18 +93,6 @@ let dynlink = let str = make_library_modifier "str" [compiler_subdir ["otherlibs"; "str"]] -let upstream_compatible = make_library_modifier - "upstream_compatible" [compiler_subdir ["otherlibs"; "upstream_compatible"]] - -let stable = make_library_modifier - "stable" [compiler_subdir ["otherlibs"; "stable"]] - -let beta = make_library_modifier - "beta" [compiler_subdir ["otherlibs"; "beta"]] - -let alpha = make_library_modifier - "alpha" [compiler_subdir ["otherlibs"; "alpha"]] - let systhreads = unix @ (make_library_modifier @@ -140,6 +128,9 @@ let runtime_suffix = if Config.runtime5 then "" else "4" let debugger = [add_compiler_subdir ("debugger" ^ runtime_suffix)] +let extension_universe_lib name = + make_library_modifier name [compiler_subdir ["otherlibs"; name]] + let _ = register_modifiers "principal" principal; register_modifiers "config" config; @@ -147,10 +138,18 @@ let _ = register_modifiers "unix" unix; register_modifiers "dynlink" dynlink; register_modifiers "str" str; - register_modifiers "upstream_compatible" upstream_compatible; - register_modifiers "stable" stable; - register_modifiers "beta" beta; - register_modifiers "alpha" alpha; + List.iter + (fun old_name -> + let new_name = "stdlib_" ^ old_name in + register_modifiers old_name (extension_universe_lib old_name); + register_modifiers new_name (extension_universe_lib new_name); + ) + [ + "upstream_compatible"; + "stable"; + "beta"; + "alpha"; + ]; List.iter (fun archive -> register_modifiers archive (compilerlibs_archive archive)) [ diff --git a/ocaml/otherlibs/alpha/dune b/ocaml/otherlibs/alpha/dune index 0638f021a22..dfa8da30b2d 100644 --- a/ocaml/otherlibs/alpha/dune +++ b/ocaml/otherlibs/alpha/dune @@ -12,6 +12,9 @@ ;* * ;************************************************************************** +;; [alpha] was renamed to [stdlib_alpha]. This library clones [stdlib_alpha] +;; until we move all existing uses of [alpha] to [stdlib_alpha]. + (library (name alpha) (wrapped false) @@ -34,6 +37,17 @@ (library_flags (:standard -linkall))) +;; We clone files from [stdlib_alpha] instead of re-exporting the library +;; to avoid adding a new transitive dependency to builds. + +(rule + (deps + (glob_files ../stdlib_alpha/*.{ml,mli})) + (targets alpha.ml alpha.mli) + (action + (bash + "cp ../stdlib_alpha/*.{ml,mli} .; mv stdlib_alpha.ml alpha.ml; mv stdlib_alpha.mli alpha.mli"))) + (install (files (glob_files diff --git a/ocaml/otherlibs/beta/dune b/ocaml/otherlibs/beta/dune index 251f67ce996..46ea9e93e82 100644 --- a/ocaml/otherlibs/beta/dune +++ b/ocaml/otherlibs/beta/dune @@ -12,6 +12,9 @@ ;* * ;************************************************************************** +;; [beta] was renamed to [stdlib_beta]. This library clones [stdlib_beta] +;; until we move all existing uses of [beta] to [stdlib_beta]. + (library (name beta) (wrapped false) @@ -34,6 +37,17 @@ (library_flags (:standard -linkall))) +;; We clone files from [stdlib_beta] instead of re-exporting the library +;; to avoid adding a new transitive dependency to builds. + +(rule + (deps + (glob_files ../stdlib_beta/*.{ml,mli})) + (targets float32.ml float32.mli float32_u.ml float32_u.mli beta.ml beta.mli) + (action + (bash + "cp ../stdlib_beta/*.{ml,mli} .; mv stdlib_beta.ml beta.ml; mv stdlib_beta.mli beta.mli"))) + (install (files (glob_files diff --git a/ocaml/otherlibs/stable/dune b/ocaml/otherlibs/stable/dune index 31454ecaefc..7d58bed0688 100644 --- a/ocaml/otherlibs/stable/dune +++ b/ocaml/otherlibs/stable/dune @@ -12,6 +12,9 @@ ;* * ;************************************************************************** +;; [stable] was renamed to [stdlib_stable]. This library clones [stdlib_stable] +;; until we move all existing uses of [stable] to [stdlib_stable]. + (library (name stable) (wrapped false) @@ -34,6 +37,27 @@ (library_flags (:standard -linkall))) +;; We clone files from [stdlib_stable] instead of re-exporting the library +;; to avoid adding a new transitive dependency to builds. + +(rule + (deps + (glob_files ../stdlib_stable/*.{ml,mli})) + (targets + float_u.ml + float_u.mli + int32_u.ml + int32_u.mli + int64_u.ml + int64_u.mli + nativeint_u.ml + nativeint_u.mli + stable.ml + stable.mli) + (action + (bash + "cp ../stdlib_stable/*.{ml,mli} .; mv stdlib_stable.ml stable.ml; mv stdlib_stable.mli stable.mli"))) + (install (files (glob_files diff --git a/ocaml/otherlibs/alpha/.ocamlformat-enable b/ocaml/otherlibs/stdlib_alpha/.ocamlformat-enable similarity index 100% rename from ocaml/otherlibs/alpha/.ocamlformat-enable rename to ocaml/otherlibs/stdlib_alpha/.ocamlformat-enable diff --git a/ocaml/otherlibs/stdlib_alpha/dune b/ocaml/otherlibs/stdlib_alpha/dune new file mode 100644 index 00000000000..ae26b807b00 --- /dev/null +++ b/ocaml/otherlibs/stdlib_alpha/dune @@ -0,0 +1,46 @@ +;************************************************************************** +;* * +;* OCaml * +;* * +;* Diana Kalinichenko, Jane Street, New York * +;* * +;* Copyright 2024 Jane Street Group LLC * +;* * +;* All rights reserved. This file is distributed under the terms of * +;* the GNU Lesser General Public License version 2.1, with the * +;* special exception on linking described in the file LICENSE. * +;* * +;************************************************************************** + +(library + (name stdlib_alpha) + (wrapped false) + (modes byte native) + (flags + (-strict-sequence + -principal + -absname + -w + +a-4-9-40-41-42-44-45-48-66 + -warn-error + A + -bin-annot + -safe-string + -strict-formats + -extension-universe + alpha)) + (ocamlopt_flags + (:include %{project_root}/ocamlopt_flags.sexp)) + (library_flags + (:standard -linkall))) + +(install + (files + (glob_files + (*.{cmxa,a,cmxs,cma,mli} with_prefix stdlib_alpha)) + (glob_files + (.stdlib_alpha.objs/byte/*.{cmi,cmt,cmti} with_prefix stdlib_alpha)) + (glob_files + (.stdlib_alpha.objs/native/*.cmx with_prefix stdlib_alpha))) + (section lib) + (package ocaml)) diff --git a/ocaml/otherlibs/alpha/alpha.ml b/ocaml/otherlibs/stdlib_alpha/stdlib_alpha.ml similarity index 100% rename from ocaml/otherlibs/alpha/alpha.ml rename to ocaml/otherlibs/stdlib_alpha/stdlib_alpha.ml diff --git a/ocaml/otherlibs/alpha/alpha.mli b/ocaml/otherlibs/stdlib_alpha/stdlib_alpha.mli similarity index 100% rename from ocaml/otherlibs/alpha/alpha.mli rename to ocaml/otherlibs/stdlib_alpha/stdlib_alpha.mli diff --git a/ocaml/otherlibs/beta/.ocamlformat-enable b/ocaml/otherlibs/stdlib_beta/.ocamlformat-enable similarity index 100% rename from ocaml/otherlibs/beta/.ocamlformat-enable rename to ocaml/otherlibs/stdlib_beta/.ocamlformat-enable diff --git a/ocaml/otherlibs/stdlib_beta/dune b/ocaml/otherlibs/stdlib_beta/dune new file mode 100644 index 00000000000..51bef563f07 --- /dev/null +++ b/ocaml/otherlibs/stdlib_beta/dune @@ -0,0 +1,46 @@ +;************************************************************************** +;* * +;* OCaml * +;* * +;* Diana Kalinichenko, Jane Street, New York * +;* * +;* Copyright 2024 Jane Street Group LLC * +;* * +;* All rights reserved. This file is distributed under the terms of * +;* the GNU Lesser General Public License version 2.1, with the * +;* special exception on linking described in the file LICENSE. * +;* * +;************************************************************************** + +(library + (name stdlib_beta) + (wrapped false) + (modes byte native) + (flags + (-strict-sequence + -principal + -absname + -w + +a-4-9-40-41-42-44-45-48-66 + -warn-error + A + -bin-annot + -safe-string + -strict-formats + -extension-universe + beta)) + (ocamlopt_flags + (:include %{project_root}/ocamlopt_flags.sexp)) + (library_flags + (:standard -linkall))) + +(install + (files + (glob_files + (*.{cmxa,a,cmxs,cma,mli} with_prefix stdlib_beta)) + (glob_files + (.stdlib_beta.objs/byte/*.{cmi,cmt,cmti} with_prefix stdlib_beta)) + (glob_files + (.stdlib_beta.objs/native/*.cmx with_prefix stdlib_beta))) + (section lib) + (package ocaml)) diff --git a/ocaml/otherlibs/beta/float32.ml b/ocaml/otherlibs/stdlib_beta/float32.ml similarity index 100% rename from ocaml/otherlibs/beta/float32.ml rename to ocaml/otherlibs/stdlib_beta/float32.ml diff --git a/ocaml/otherlibs/beta/float32.mli b/ocaml/otherlibs/stdlib_beta/float32.mli similarity index 100% rename from ocaml/otherlibs/beta/float32.mli rename to ocaml/otherlibs/stdlib_beta/float32.mli diff --git a/ocaml/otherlibs/beta/float32_u.ml b/ocaml/otherlibs/stdlib_beta/float32_u.ml similarity index 100% rename from ocaml/otherlibs/beta/float32_u.ml rename to ocaml/otherlibs/stdlib_beta/float32_u.ml diff --git a/ocaml/otherlibs/beta/float32_u.mli b/ocaml/otherlibs/stdlib_beta/float32_u.mli similarity index 100% rename from ocaml/otherlibs/beta/float32_u.mli rename to ocaml/otherlibs/stdlib_beta/float32_u.mli diff --git a/ocaml/otherlibs/beta/beta.ml b/ocaml/otherlibs/stdlib_beta/stdlib_beta.ml similarity index 100% rename from ocaml/otherlibs/beta/beta.ml rename to ocaml/otherlibs/stdlib_beta/stdlib_beta.ml diff --git a/ocaml/otherlibs/beta/beta.mli b/ocaml/otherlibs/stdlib_beta/stdlib_beta.mli similarity index 100% rename from ocaml/otherlibs/beta/beta.mli rename to ocaml/otherlibs/stdlib_beta/stdlib_beta.mli diff --git a/ocaml/otherlibs/stable/.ocamlformat-enable b/ocaml/otherlibs/stdlib_stable/.ocamlformat-enable similarity index 100% rename from ocaml/otherlibs/stable/.ocamlformat-enable rename to ocaml/otherlibs/stdlib_stable/.ocamlformat-enable diff --git a/ocaml/otherlibs/stdlib_stable/dune b/ocaml/otherlibs/stdlib_stable/dune new file mode 100644 index 00000000000..3b3086ddaff --- /dev/null +++ b/ocaml/otherlibs/stdlib_stable/dune @@ -0,0 +1,46 @@ +;************************************************************************** +;* * +;* OCaml * +;* * +;* Diana Kalinichenko, Jane Street, New York * +;* * +;* Copyright 2024 Jane Street Group LLC * +;* * +;* All rights reserved. This file is distributed under the terms of * +;* the GNU Lesser General Public License version 2.1, with the * +;* special exception on linking described in the file LICENSE. * +;* * +;************************************************************************** + +(library + (name stdlib_stable) + (wrapped false) + (modes byte native) + (flags + (-strict-sequence + -principal + -absname + -w + +a-4-9-40-41-42-44-45-48-66 + -warn-error + A + -bin-annot + -safe-string + -strict-formats + -extension-universe + stable)) + (ocamlopt_flags + (:include %{project_root}/ocamlopt_flags.sexp)) + (library_flags + (:standard -linkall))) + +(install + (files + (glob_files + (*.{cmxa,a,cmxs,cma,mli} with_prefix stdlib_stable)) + (glob_files + (.stdlib_stable.objs/byte/*.{cmi,cmt,cmti} with_prefix stdlib_stable)) + (glob_files + (.stdlib_stable.objs/native/*.cmx with_prefix stdlib_stable))) + (section lib) + (package ocaml)) diff --git a/ocaml/otherlibs/stable/float_u.ml b/ocaml/otherlibs/stdlib_stable/float_u.ml similarity index 100% rename from ocaml/otherlibs/stable/float_u.ml rename to ocaml/otherlibs/stdlib_stable/float_u.ml diff --git a/ocaml/otherlibs/stable/float_u.mli b/ocaml/otherlibs/stdlib_stable/float_u.mli similarity index 100% rename from ocaml/otherlibs/stable/float_u.mli rename to ocaml/otherlibs/stdlib_stable/float_u.mli diff --git a/ocaml/otherlibs/stable/int32_u.ml b/ocaml/otherlibs/stdlib_stable/int32_u.ml similarity index 100% rename from ocaml/otherlibs/stable/int32_u.ml rename to ocaml/otherlibs/stdlib_stable/int32_u.ml diff --git a/ocaml/otherlibs/stable/int32_u.mli b/ocaml/otherlibs/stdlib_stable/int32_u.mli similarity index 100% rename from ocaml/otherlibs/stable/int32_u.mli rename to ocaml/otherlibs/stdlib_stable/int32_u.mli diff --git a/ocaml/otherlibs/stable/int64_u.ml b/ocaml/otherlibs/stdlib_stable/int64_u.ml similarity index 100% rename from ocaml/otherlibs/stable/int64_u.ml rename to ocaml/otherlibs/stdlib_stable/int64_u.ml diff --git a/ocaml/otherlibs/stable/int64_u.mli b/ocaml/otherlibs/stdlib_stable/int64_u.mli similarity index 100% rename from ocaml/otherlibs/stable/int64_u.mli rename to ocaml/otherlibs/stdlib_stable/int64_u.mli diff --git a/ocaml/otherlibs/stable/nativeint_u.ml b/ocaml/otherlibs/stdlib_stable/nativeint_u.ml similarity index 100% rename from ocaml/otherlibs/stable/nativeint_u.ml rename to ocaml/otherlibs/stdlib_stable/nativeint_u.ml diff --git a/ocaml/otherlibs/stable/nativeint_u.mli b/ocaml/otherlibs/stdlib_stable/nativeint_u.mli similarity index 100% rename from ocaml/otherlibs/stable/nativeint_u.mli rename to ocaml/otherlibs/stdlib_stable/nativeint_u.mli diff --git a/ocaml/otherlibs/stable/stable.ml b/ocaml/otherlibs/stdlib_stable/stdlib_stable.ml similarity index 100% rename from ocaml/otherlibs/stable/stable.ml rename to ocaml/otherlibs/stdlib_stable/stdlib_stable.ml diff --git a/ocaml/otherlibs/stable/stable.mli b/ocaml/otherlibs/stdlib_stable/stdlib_stable.mli similarity index 100% rename from ocaml/otherlibs/stable/stable.mli rename to ocaml/otherlibs/stdlib_stable/stdlib_stable.mli diff --git a/ocaml/otherlibs/upstream_compatible/.ocamlformat-enable b/ocaml/otherlibs/stdlib_upstream_compatible/.ocamlformat-enable similarity index 100% rename from ocaml/otherlibs/upstream_compatible/.ocamlformat-enable rename to ocaml/otherlibs/stdlib_upstream_compatible/.ocamlformat-enable diff --git a/ocaml/otherlibs/stdlib_upstream_compatible/dune b/ocaml/otherlibs/stdlib_upstream_compatible/dune new file mode 100644 index 00000000000..e76d71248b6 --- /dev/null +++ b/ocaml/otherlibs/stdlib_upstream_compatible/dune @@ -0,0 +1,50 @@ +;************************************************************************** +;* * +;* OCaml * +;* * +;* Diana Kalinichenko, Jane Street, New York * +;* * +;* Copyright 2024 Jane Street Group LLC * +;* * +;* All rights reserved. This file is distributed under the terms of * +;* the GNU Lesser General Public License version 2.1, with the * +;* special exception on linking described in the file LICENSE. * +;* * +;************************************************************************** + +(library + (name stdlib_upstream_compatible) + (wrapped false) + (modes byte native) + (flags + (-strict-sequence + -principal + -absname + -w + +a-4-9-40-41-42-44-45-48-66 + -warn-error + A + -bin-annot + -safe-string + -strict-formats + -extension-universe + upstream_compatible)) + (ocamlopt_flags + (:include %{project_root}/ocamlopt_flags.sexp)) + (library_flags + (:standard -linkall))) + +(install + (files + (glob_files + (*.{cmxa,a,cmxs,cma,mli} with_prefix stdlib_upstream_compatible)) + (glob_files + (.stdlib_upstream_compatible.objs/byte/*.{cmi,cmt,cmti} + with_prefix + stdlib_upstream_compatible)) + (glob_files + (.stdlib_upstream_compatible.objs/native/*.cmx + with_prefix + stdlib_upstream_compatible))) + (section lib) + (package ocaml)) diff --git a/ocaml/otherlibs/upstream_compatible/upstream_compatible.ml b/ocaml/otherlibs/stdlib_upstream_compatible/stdlib_upstream_compatible.ml similarity index 100% rename from ocaml/otherlibs/upstream_compatible/upstream_compatible.ml rename to ocaml/otherlibs/stdlib_upstream_compatible/stdlib_upstream_compatible.ml diff --git a/ocaml/otherlibs/upstream_compatible/upstream_compatible.mli b/ocaml/otherlibs/stdlib_upstream_compatible/stdlib_upstream_compatible.mli similarity index 100% rename from ocaml/otherlibs/upstream_compatible/upstream_compatible.mli rename to ocaml/otherlibs/stdlib_upstream_compatible/stdlib_upstream_compatible.mli diff --git a/ocaml/otherlibs/upstream_compatible/dune b/ocaml/otherlibs/upstream_compatible/dune index 1a66238d423..af574fe794c 100644 --- a/ocaml/otherlibs/upstream_compatible/dune +++ b/ocaml/otherlibs/upstream_compatible/dune @@ -12,6 +12,10 @@ ;* * ;************************************************************************** +;; [upstream_compatible] was renamed to [stdlib_upstream_compatible]. +;; This library clones [stdlib_upstream_compatible] until we move all +;; existing uses of [upstream_compatible] to [stdlib_upstream_compatible]. + (library (name upstream_compatible) (wrapped false) @@ -34,6 +38,17 @@ (library_flags (:standard -linkall))) +;; We clone files from [stdlib_upstream_compatible] instead of re-exporting the library +;; to avoid adding a new transitive dependency to builds. + +(rule + (deps + (glob_files ../stdlib_upstream_compatible/*.{ml,mli})) + (targets upstream_compatible.ml upstream_compatible.mli) + (action + (bash + "cp ../stdlib_upstream_compatible/*.{ml,mli} .; mv stdlib_upstream_compatible.ml upstream_compatible.ml; mv stdlib_upstream_compatible.mli upstream_compatible.mli"))) + (install (files (glob_files diff --git a/testsuite/tests/lib-extensions/alpha_exports.ml b/testsuite/tests/lib-extensions/alpha_exports.ml index 94bcbaab802..c283c905c35 100644 --- a/testsuite/tests/lib-extensions/alpha_exports.ml +++ b/testsuite/tests/lib-extensions/alpha_exports.ml @@ -1,6 +1,6 @@ (* TEST flags = "-extension-universe alpha"; - include alpha; + include stdlib_alpha; { bytecode; }{ @@ -8,4 +8,4 @@ } *) -open Alpha +open Stdlib_alpha diff --git a/testsuite/tests/lib-extensions/beta_exports.ml b/testsuite/tests/lib-extensions/beta_exports.ml index fb09425cc82..406e1fec8eb 100644 --- a/testsuite/tests/lib-extensions/beta_exports.ml +++ b/testsuite/tests/lib-extensions/beta_exports.ml @@ -1,6 +1,6 @@ (* TEST flags = "-extension-universe beta"; - include beta; + include stdlib_beta; { bytecode; }{ @@ -8,7 +8,7 @@ } *) -open Beta +open Stdlib_beta (* Test that [Float32] is exported. *) diff --git a/testsuite/tests/lib-extensions/modules.ml b/testsuite/tests/lib-extensions/modules.ml index fe5e10e23ba..261f6f3060f 100644 --- a/testsuite/tests/lib-extensions/modules.ml +++ b/testsuite/tests/lib-extensions/modules.ml @@ -1,9 +1,9 @@ (* TEST flags = "-extension-universe alpha"; - include upstream_compatible; - include stable; - include beta; - include alpha; + include stdlib_upstream_compatible; + include stdlib_stable; + include stdlib_beta; + include stdlib_alpha; { bytecode; }{ @@ -12,7 +12,7 @@ *) (* Check that extension library modules exist. *) -module Upstream_compatible = Upstream_compatible -module Stable = Stable -module Beta = Beta -module Alpha = Alpha +module Upstream_compatible = Stdlib_upstream_compatible +module Stable = Stdlib_stable +module Beta = Stdlib_beta +module Alpha = Stdlib_alpha diff --git a/testsuite/tests/lib-extensions/old_names.ml b/testsuite/tests/lib-extensions/old_names.ml new file mode 100644 index 00000000000..382cd771e18 --- /dev/null +++ b/testsuite/tests/lib-extensions/old_names.ml @@ -0,0 +1,18 @@ +(* TEST + flags = "-extension-universe alpha"; + include upstream_compatible; + include stable; + include beta; + include alpha; + { + bytecode; + }{ + native; + } +*) + +(* Check that old names for the libraries still work. *) +module Upstream_compatible = Upstream_compatible +module Stable = Stable +module Beta = Beta +module Alpha = Alpha diff --git a/testsuite/tests/lib-extensions/stable_exports.ml b/testsuite/tests/lib-extensions/stable_exports.ml index e897b33c4b0..89875da180d 100644 --- a/testsuite/tests/lib-extensions/stable_exports.ml +++ b/testsuite/tests/lib-extensions/stable_exports.ml @@ -1,6 +1,6 @@ (* TEST flags = "-extension-universe stable"; - include stable; + include stdlib_stable; { bytecode; }{ @@ -8,7 +8,7 @@ } *) -open Stable +open Stdlib_stable (* Test that [Float_u] is exported. *) diff --git a/testsuite/tests/lib-extensions/upstream_exports.ml b/testsuite/tests/lib-extensions/upstream_exports.ml index ec15b37e1ad..3b31f2a2721 100644 --- a/testsuite/tests/lib-extensions/upstream_exports.ml +++ b/testsuite/tests/lib-extensions/upstream_exports.ml @@ -1,6 +1,6 @@ (* TEST flags = "-extension-universe upstream_compatible"; - include upstream_compatible; + include stdlib_upstream_compatible; { bytecode; }{ @@ -8,4 +8,4 @@ } *) -open Upstream_compatible +open Stdlib_upstream_compatible