Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Change the Standard Library prefixing to match Dune's #10169

Merged
merged 3 commits into from
Feb 10, 2021
Merged

Change the Standard Library prefixing to match Dune's #10169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3271821
Simplify api_docgen/Makefile.docfiles
dra27 Jan 21, 2021
9a4e32a
Rename STDLIB_MODS to STDLIB_MODULE_BASENAMES
dra27 Jan 21, 2021
53ba024
Use capital letters for stdlib modules
dra27 Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ Working version
- #9582: Add Array.{find_opt,find_map,split,combine}.
(Nicolás Ojeda Bär, review by Daniel Bünzli and Gabriel Scherer)

* #10169: Use capitalized module names in the Standard Library prefixing scheme
to match Dune, e.g. Stdlib__String instead of Stdlib__string. This is a
breaking change only to code which attempted to use the internal names before.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a breaking change only to code which attempted to use the internal names before.

Is there code like that in the wild? If not, we can remove the mention (it's relatively obvious). If yes, we can use a * marker for the entry.

Maybe we should try to get opam-repository results for the change? (cc @Octachron)
(Hmm, this patchset might be painful to rebase on 4.12.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see my full report for opam-repository in my last comment above

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, sorry! (It's there.) I had read it before, but on re-reviewing I forgot about this context.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops - I have pushed the asterisk! I have also opened a PR against ocamlfind, so it's not a tedious blocker at the start of the 4.13 testing cycle.

The Standard Library generated by the Dune rules is now equivalent to the main
build (the Dune rules still do not generate a distributable compiler).
(David Allsopp and Mark Shinwell, review by Gabriel Scherer)

### Other libraries:

* #10084: Unix.open_process_args* functions now look up the program in the PATH.
Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ TOPLEVELSTART=toplevel/topstart.cmo

TOPLEVELINIT=toplevel/toploop.cmo

# This list is passed to expunge, which accepts both uncapitalized and
# capitalized module names.
PERVASIVES=$(STDLIB_MODULES) outcometree topdirs toploop

LIBFILES=stdlib.cma std_exit.cmo *.cmi camlheader
Expand Down
5 changes: 1 addition & 4 deletions api_docgen/Makefile.docfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ thread_MLIS := \
thread.mli condition.mli mutex.mli event.mli \
threadUnix.mli semaphore.mli

STDLIB=$(filter-out stdlib__pervasives, $(STDLIB_MODULES))

stdlib_UNPREFIXED=$(STDLIB:stdlib__%=%)
libref= \
$(stdlib_UNPREFIXED) \
$(filter-out pervasives,$(STDLIB_MODULE_BASENAMES)) \
$(str_MLIS:%.mli=%) \
$(unix_MLIS:%.mli=%) \
$(dynlink_MLIS:%.mli=%) \
Expand Down