Skip to content

Merge 5.2.0minus-24 #201

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

Merged
liam923 merged 21 commits into from
Nov 26, 2025
Merged

Merge 5.2.0minus-24 #201

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8066e61
Import ocaml sources for oxcaml/oxcaml@8abf835dda41
liam923 Nov 25, 2025
1aaa9d2
Automatic merges
liam923 Nov 25, 2025
4d706f9
Commit conflicts
liam923 Nov 25, 2025
f73f8de
Resolve trivial conflicts
liam923 Nov 25, 2025
bffc3a6
Fix some errors
liam923 Nov 25, 2025
36e61a5
Fix more errors
liam923 Nov 25, 2025
185453c
Add doc for shareable
liam923 Nov 25, 2025
8570be1
Fix more errors
liam923 Nov 25, 2025
45b1502
Make lazier
liam923 Nov 25, 2025
00e7d73
Bump magic numbers
liam923 Nov 25, 2025
f1a8cdb
Benign test changes
liam923 Nov 25, 2025
55ec2f4
Fix documentation bug
liam923 Nov 25, 2025
8874ccf
Add doc for staticity
liam923 Nov 26, 2025
bf65768
Undo + location change
liam923 Nov 26, 2025
3690c74
Fix parameterized modules test
liam923 Nov 26, 2025
ce56bfe
Update ignored flags
liam923 Nov 26, 2025
a0de8a3
Import ocaml sources for oxcaml/oxcaml@996a6635f0b1
liam923 Nov 26, 2025
4beb021
Automatic merges
liam923 Nov 26, 2025
98ee01d
Commit conflicts
liam923 Nov 26, 2025
af6e4b7
Resolve conflicts
liam923 Nov 26, 2025
1927fee
Fix type error
liam923 Nov 26, 2025
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
2 changes: 1 addition & 1 deletion tests/test-dirs/occurrences/issue1404.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@ locate position 2:1 returns the definition of [(+)]
"file": "lib/ocaml/stdlib.mli",
"pos": {
"line": 344,
"col": 0
"col": 9
Copy link
Contributor

@dkalinichenko-js dkalinichenko-js Nov 26, 2025

Choose a reason for hiding this comment

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

What's the context for this?

Copy link
Contributor Author

@liam923 liam923 Nov 26, 2025

Choose a reason for hiding this comment

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

There's actually no net change here. On main this is 9 (9 is the correct value), but due to the cms thing, the column here changed to 0. When I changed the prioritization order, this changed back to 9. I just happened to promote and commit this test before making the prioritization change (see f1a8cdb).

}
}