Skip to content

OxCaml minus39 fixes. - #1469

Merged
jonludlam merged 2 commits into
ocaml:masterfrom
jonludlam:oxcaml-minus-39
Aug 26, 2026
Merged

OxCaml minus39 fixes.#1469
jonludlam merged 2 commits into
ocaml:masterfrom
jonludlam:oxcaml-minus-39

Conversation

@jonludlam

Copy link
Copy Markdown
Member

Note that we'll need to do some work to handle module types with with kind expressions. For now, I've changed it to return an option and switched to filter_map. The other changes are mostly mechanical.

@art-w art-w left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks! I'll rebase my other PRs on top once this is merged :)

(Load_path.get_paths () |> List.filter (fun s -> s <> ""))
#else
!Config.load_path
#endif

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is starting to get hard to read ^^' Maybe consider extracting?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Good call - I've tidied it a bit

@panglesd panglesd left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's merge so that the many oxcaml PRs can be rebased!

Comment thread odoc.opam
conflicts: [
"ocaml-option-bytecode-only"
"oxcaml-compiler" {< "5.2.0minus31"}
"oxcaml-compiler" {< "5.2.0minus39"}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Shouldn't it be

Suggested change
"oxcaml-compiler" {< "5.2.0minus39"}
"oxcaml-compiler" {!= "5.2.0minus39"}

?
I just tried to install odoc on oxcaml minus39, and instead of failing as not compatible, it tried (and failed without this PR).

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I think the plan was to be 'optimistic' - what we should do is modify the opam file for odoc.3.2.1 in opam-repository to have an upper bound, but to leave this as is, just in case by some miracle minus47 comes out next week and it doesn't require changes :-)

Note that we'll need to do some work to handle module types with
`with kind` expressions. For now, I've changed it to return an option
and switched to `filter_map`. The other changes are mostly mechanical.
@jonludlam
jonludlam merged commit a3eb65f into ocaml:master Aug 26, 2026
13 checks passed
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