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.

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

4.10 compatibility #408

Merged
merged 6 commits into from
Jan 31, 2020
Merged

4.10 compatibility #408

merged 6 commits into from
Jan 31, 2020

Conversation

jonludlam
Copy link
Member

This moves us in the direction of using 4.10's data types everywhere - though it doesn't go quite as far as making the module names optional.

Signed-off-by: Jon Ludlam <jon@recoil.org>
See:
ocaml#230 (comment)

Signed-off-by: Jon Ludlam <jon@recoil.org>
Signed-off-by: Jon Ludlam <jon@recoil.org>
@aantron
Copy link
Contributor

aantron commented Jan 13, 2020

I think we should keep the test case, and make it conditional on the compiler version, if necessary. The original issue that it was added for was an assertion failure. We want to be sure not to reintroduce it when odoc is used with older versions.

@jonludlam
Copy link
Member Author

Good plan!

Copy link
Contributor

@lpw25 lpw25 left a comment

Choose a reason for hiding this comment

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

The treatment of module declarations/bindings without identifiers should be different. Other than that it looks good to me.

src/model/maps.mli Show resolved Hide resolved
src/loader/cmti.ml Show resolved Hide resolved
src/loader/cmt.ml Show resolved Hide resolved
Signed-off-by: Jon Ludlam <jon@recoil.org>
Copy link
Contributor

@lpw25 lpw25 left a comment

Choose a reason for hiding this comment

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

LGTM

@jonludlam jonludlam merged commit 35f5619 into ocaml:master Jan 31, 2020
jonludlam added a commit to jonludlam/opam-repository that referenced this pull request Feb 7, 2020
CHANGES:

Additions

- Add option to turn warnings into errors (ocaml/odoc#398, Jules Aguillon)

Bugs fixed

- Emit quote before identifier in alias type expr (Fixes ocaml/odoc#391, Anton Bachin)
- Handle generalized open statements introduced in 4.08 (ocaml/odoc#393, Jon Ludlam)
- Refactor error reporting to avoid exiting the program in library code
  (ocaml/odoc#400, Jules Aguillon)
- Build on OCaml 4.10 (ocaml/odoc#408, Jon Ludlam)
mgree pushed a commit to mgree/opam-repository that referenced this pull request Feb 19, 2020
CHANGES:

Additions

- Add option to turn warnings into errors (ocaml/odoc#398, Jules Aguillon)

Bugs fixed

- Emit quote before identifier in alias type expr (Fixes ocaml/odoc#391, Anton Bachin)
- Handle generalized open statements introduced in 4.08 (ocaml/odoc#393, Jon Ludlam)
- Refactor error reporting to avoid exiting the program in library code
  (ocaml/odoc#400, Jules Aguillon)
- Build on OCaml 4.10 (ocaml/odoc#408, Jon Ludlam)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants