Skip to content

Upgrade to Ocaml 413#1397

Merged
voodoos merged 83 commits intomasterfrom
ocaml-413
Nov 23, 2021
Merged

Upgrade to Ocaml 413#1397
voodoos merged 83 commits intomasterfrom
ocaml-413

Conversation

@voodoos
Copy link
Copy Markdown
Collaborator

@voodoos voodoos commented Oct 29, 2021

@let-def I merged your changes to synchronize with 4.13.1

Did you also start reviewing the upgrade ? This new PR is the right place to make comments.

@voodoos
Copy link
Copy Markdown
Collaborator Author

voodoos commented Nov 4, 2021

@let-def , @trefis : any intuition regarding the CI failure ?

Only happening on debian-11-4.13_x86_32 :

--- a/../../../default/tests/test-dirs/document/src-documentation.t/run.t
+++ b/tests/test-dirs/document/src-documentation.t/run.t.corrected
@@ -43,6 +43,9 @@ documentation for the non-last defined value (in the same file) is show
   " List reversal. "
 
   $ dune build --root=. ./doc.exe
+      ocamlopt doc.exe
+  /usr/bin/ld: .doc.eobjs/native/doc.o: warning: relocation in read-only section `.text'
+  /usr/bin/ld: warning: creating DT_TEXTREL in a PIE

@nojb
Copy link
Copy Markdown
Contributor

nojb commented Nov 4, 2021

@let-def , @trefis : any intuition regarding the CI failure ?

This is a 32-bit system, right? See ocaml/ocaml#9800

@voodoos
Copy link
Copy Markdown
Collaborator Author

voodoos commented Nov 4, 2021

Oh right, that must be it !
Thanks for the pointer

@let-def
Copy link
Copy Markdown
Contributor

let-def commented Nov 8, 2021

I will review again today, but it already looked good last time I looked.

@voodoos
Copy link
Copy Markdown
Collaborator Author

voodoos commented Nov 8, 2021

I will review again today, but it already looked good last time I looked.

Thank you !

For the failing test I guess we can just disable it with (enabled_if (<> %{architecture} "86_32"))

Copy link
Copy Markdown
Contributor

@let-def let-def left a comment

Choose a reason for hiding this comment

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

As far as I am concerned, the PR could be merged as is.
I suggest a few cosmetic changes that could simplify maintenance, but nothing important.

@nojb
Copy link
Copy Markdown
Contributor

nojb commented Nov 17, 2021

Friendly ping. Is there anything left to do here? It would be nice to have an official release for 4.13. Thanks!

@voodoos
Copy link
Copy Markdown
Collaborator Author

voodoos commented Nov 17, 2021

Friendly ping. Is there anything left to do here? It would be nice to have an official release for 4.13. Thanks!

We plan to submit the PR to opam repository before the end of the week!

@voodoos voodoos merged commit 7607238 into master Nov 23, 2021
pitag-ha added a commit to pitag-ha/merlin that referenced this pull request Jul 24, 2023
The test updates between the following two PRs:
ocaml#1329
ocaml#1397

There seems to have been an error regression in [locate] between those
two commits. That can be seen both in the category_data.json and in the
full_responses.json.

real    15m27,573s
user    3m5,058s
sys     0m20,955s
pitag-ha added a commit to pitag-ha/merlin that referenced this pull request Jul 25, 2023
This is the change right after the 4.13 bump, i.e. PR
ocaml#1397

There seems to have been an error regression in occurrences (see
category_data.t):
Sometimes it returns an Empty return now, where before it returned a value.

Also, [complete-prefix] has changed (see full_response.t): Sometimes it
adds more options now, e.g. ["name": "acosh"] and ["name": "asinh"]
somewhere.

Also, type aliases now seem to be handled differently sometimes
(see full_response.t): e.g. [Path.t] -> [path];
[P.Contents.value] -> [contents]; [inode_tree] -> [proof_inode] etc

Also, the Typedtree bump is of course reflected in Merlin, e.g.
- [('a, 'b, 'c, 'd, 'e, 'f) Camlinternal
FormatBasics.format6] is now [('a, 'b, 'c, 'd, 'e, 'f) format]

Also, this commit contains some noise that shouldn't be there, because
compiler specific messages weren't filtered out yet.
pitag-ha added a commit to pitag-ha/merlin that referenced this pull request Jul 25, 2023
This is the change between right after 4.13 bump and right before 4.14
bump, i.e. between
ocaml#1397
ocaml#1415

[locate] has changed in two ways: An error regression was fixed (before
[Return Msg], now [Return Other]); there's a change in behavior, where
now it sometimes points to a different place than before.
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.

4 participants