Skip to content

Cleanup OpamStd of duplicated functions that already exist in Stdlib - #6442

Merged
rjbou merged 11 commits into
ocaml:masterfrom
kit-ty-kate:upgrade-to-ocaml-4.08-stdlib
Aug 28, 2025
Merged

Cleanup OpamStd of duplicated functions that already exist in Stdlib#6442
rjbou merged 11 commits into
ocaml:masterfrom
kit-ty-kate:upgrade-to-ocaml-4.08-stdlib

Conversation

@kit-ty-kate

@kit-ty-kate kit-ty-kate commented Mar 30, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Queued on #6444
Queued on #6394
Queued on #6655
Requires ocaml-opam/opam-rt#85
Requires ocaml-opam/opam-publish#173
See robur-coop/orb#22
See ocaml/odoc#1383

A little spring cleaning

@kit-ty-kate kit-ty-kate added this to the 2.4.0~alpha1 milestone Mar 30, 2025
@kit-ty-kate
kit-ty-kate requested a review from rjbou March 30, 2025 15:57
@kit-ty-kate
kit-ty-kate force-pushed the upgrade-to-ocaml-4.08-stdlib branch from b38f27d to c592209 Compare March 30, 2025 16:19
@kit-ty-kate kit-ty-kate mentioned this pull request Mar 30, 2025
Merged
@kit-ty-kate kit-ty-kate added the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Mar 30, 2025
@kit-ty-kate
kit-ty-kate force-pushed the upgrade-to-ocaml-4.08-stdlib branch 2 times, most recently from 20f6dce to 3be9b6e Compare March 31, 2025 13:26
@kit-ty-kate kit-ty-kate removed the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Mar 31, 2025
kit-ty-kate
kit-ty-kate commented Mar 31, 2025
View reviewed changes
Comment thread src/client/opamConfigCommand.ml
| (k, v, comment) :: r ->
if OpamConsole.verbose () then
OpamStd.Option.iter (Printf.ksprintf output ": %s;\n") comment;
Stdlib.Option.iter (Printf.ksprintf output ": %s;\n") comment;

@kit-ty-kate kit-ty-kate Mar 31, 2025

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.

Side note for reviewers: explicit uses of Stdlib is required in opam-client and opam-solver because extlib (used via dose3) shadows the standard library module

@kit-ty-kate kit-ty-kate mentioned this pull request Mar 31, 2025
Closed
kit-ty-kate added a commit to kit-ty-kate/opam-rt that referenced this pull request Mar 31, 2025
@kit-ty-kate
Apply API changes from ocaml/opam#6442
f27224d
@kit-ty-kate kit-ty-kate mentioned this pull request Mar 31, 2025
Merged
@kit-ty-kate kit-ty-kate added the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Apr 7, 2025
rjbou
rjbou approved these changes Apr 9, 2025
View reviewed changes

@rjbou rjbou left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks! Good cleaning!
I took the opportunity to indent some lines.
As discussed, we'll try to merge #6394 to live test the job with this PR (and ease the maintenance job on these projects).

Comment thread src/core/opamCompat.ml Outdated
Comment thread src/state/opamFormatUpgrade.ml Outdated
Comment thread src/state/opamSysPoll.ml Outdated
@kit-ty-kate

kit-ty-kate commented Jul 1, 2025 •
edited
Loading

Copy link
Copy Markdown
Member Author

Note to myself for whenever i rebase this: OpamStd.Set.map is also redundant

@kit-ty-kate
kit-ty-kate force-pushed the upgrade-to-ocaml-4.08-stdlib branch from 3be9b6e to 549d609 Compare July 29, 2025 23:28
@kit-ty-kate kit-ty-kate added AREA: API and removed PR: QUEUED Pending pull request, waiting for other work to be merged or closed PR: NEEDS UPDATE labels Jul 29, 2025
@kit-ty-kate
kit-ty-kate requested a review from rjbou July 29, 2025 23:29
@kit-ty-kate
kit-ty-kate force-pushed the upgrade-to-ocaml-4.08-stdlib branch from 549d609 to d548c62 Compare July 30, 2025 11:41
@kit-ty-kate

kit-ty-kate commented Jul 30, 2025

Copy link
Copy Markdown
Member Author

OCaml Benchmarks seems to show a 3 to 8% speedup

@rjbou rjbou added the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Jul 30, 2025
@kit-ty-kate kit-ty-kate mentioned this pull request Aug 18, 2025
Merged
@kit-ty-kate
kit-ty-kate force-pushed the upgrade-to-ocaml-4.08-stdlib branch from fef413e to c591adf Compare August 26, 2025 20:38
@kit-ty-kate kit-ty-kate removed the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Aug 26, 2025
kit-ty-kate added a commit to ocaml-opam/opam-publish that referenced this pull request Aug 27, 2025
@kit-ty-kate
Apply API changes from ocaml/opam#6442
2b0a837
@kit-ty-kate kit-ty-kate mentioned this pull request Aug 27, 2025
Merged
@kit-ty-kate
kit-ty-kate force-pushed the upgrade-to-ocaml-4.08-stdlib branch from c591adf to bf9c1c9 Compare August 27, 2025 12:44
@kit-ty-kate kit-ty-kate added PRIORITY PR: QUEUED Pending pull request, waiting for other work to be merged or closed labels Aug 27, 2025
@kit-ty-kate
kit-ty-kate force-pushed the upgrade-to-ocaml-4.08-stdlib branch from bf9c1c9 to 5e75ded Compare August 28, 2025 10:16
kit-ty-kate added a commit to ocaml-opam/opam-publish that referenced this pull request Aug 28, 2025
@kit-ty-kate
Apply API changes from ocaml/opam#6442
ea1cc0e
This was referenced Aug 28, 2025
Merged
Merged
@kit-ty-kate kit-ty-kate removed the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Aug 28, 2025
kit-ty-kate and others added 11 commits August 28, 2025 14:28
@kit-ty-kate
Replace functions from OpamStd.Option by ones that already exist in S…
5f1957c 
…tdlib.Option
@kit-ty-kate
Move OpamStd.List.fold_left_map to OpamCompat.List
e0137d0
@kit-ty-kate
Replace functions from OpamStd.List by ones that already exist in Std…
7b03856 
…lib.List
@kit-ty-kate
Move OpamStd.String.{starts_with,ends_with,for_all,fold_left} to Opam…
f3ba57d 
…Compat.String
@kit-ty-kate
Replace functions from OpamStd.String by ones that already exist in S…
4d4528a 
…tdlib.String
@kit-ty-kate
Replace OpamStd.String.contains_char by Stdlib.String.contains
b32f5e0
@kit-ty-kate
Replace operators from OpamStd.Op by ones that already exist in Stdlib
a74dfc0
@kit-ty-kate
Remove OpamStd.Set.{map,choose_opt} as they already exist in Stdlib.Set
b159a4b
@kit-ty-kate
Remove OpamStd.Map.{find_opt,choose_opt} as they already exist in Std…
9a83a44 
…lib.Map
@kit-ty-kate
Move OpamStd.Map.filter_map to OpamCompat.Map
dd5fa4e
@kit-ty-kate
Remove hidden reimplementations of functions from OpamStd.{Set,Map} t…
a5eec66 
…hat already exist in Stdlib.{Set,Map} and have the same behaviour
@kit-ty-kate
kit-ty-kate force-pushed the upgrade-to-ocaml-4.08-stdlib branch from 5e75ded to a5eec66 Compare August 28, 2025 13:29
@rjbou
rjbou merged commit 55c5c35 into ocaml:master Aug 28, 2025
58 checks passed
@kit-ty-kate
kit-ty-kate deleted the upgrade-to-ocaml-4.08-stdlib branch August 28, 2025 15:42
kit-ty-kate added a commit to ocaml-opam/opam-publish that referenced this pull request Aug 28, 2025
@kit-ty-kate
Merge pull request #173 from ocaml-opam/upgrade-to-ocaml-4.08-stdlib
b80bee9 
Apply API changes from ocaml/opam#6442
kit-ty-kate added a commit to ocaml-opam/opam-rt that referenced this pull request Aug 28, 2025
@kit-ty-kate
Merge pull request #85 from ocaml-opam/upgrade-to-ocaml-4.08-stdlib
35325c1 
Apply API changes from ocaml/opam#6442
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rjbou rjbou rjbou approved these changes

Assignees

No one assigned

Labels

AREA: API AREA: PERFORMANCE PRIORITY

Projects

None yet

Milestone

2.5.0~alpha1

Development

Successfully merging this pull request may close these issues.

2 participants

@kit-ty-kate @rjbou