Skip to content

Changes: synchronize trunk with the 4.05 branch#1241

Merged
gasche merged 4 commits intoocaml:trunkfrom
gasche:sync-trunk-Changes-with-4.05-Changes
Jul 19, 2017
Merged

Changes: synchronize trunk with the 4.05 branch#1241
gasche merged 4 commits intoocaml:trunkfrom
gasche:sync-trunk-Changes-with-4.05-Changes

Conversation

@gasche
Copy link
Member

@gasche gasche commented Jul 13, 2017

No description provided.

@gasche gasche requested a review from damiendoligez July 13, 2017 12:25
@gasche gasche force-pushed the sync-trunk-Changes-with-4.05-Changes branch from a32f2d7 to 30bd494 Compare July 13, 2017 12:32
@gasche gasche requested a review from Octachron July 14, 2017 14:05
@gasche
Copy link
Member Author

gasche commented Jul 14, 2017

To this Changes-train I added a minor commit to fix the change entry for #1012.

Copy link
Member

@Octachron Octachron left a comment

Choose a reason for hiding this comment

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

I found two minor points that could be fixed.

Changes Outdated

* GPR#659: Remove support for SPARC native code generation
(Mark Shinwell)
- PR#7447, GPR#995: incorrect code generation for nested recursive bindings
Copy link
Member

Choose a reason for hiding this comment

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

PR#7447 ⇒ MPR#7447?

Changes Outdated
- PR#7511, GPR#1133: Unboxed type with unboxed argument should not be accepted
(Damien Doligez, review by Jeremy Yallop and Leo White)

- GPR#795: remove 256-character limitation on Sys.executable_name
Copy link
Member

Choose a reason for hiding this comment

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

Duplicata at line 335?

@gasche
Copy link
Member Author

gasche commented Jul 14, 2017

@Octachron thanks, I fixed both issues. In fact I converted all PR# mentions in trunk into MPR#, because now that GPR# are four-digit numbers as well I think there are more opportunities for confusion.

Copy link
Member

@damiendoligez damiendoligez left a comment

Choose a reason for hiding this comment

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

LGTM except for the duplicated entry.


- MPR#7501, GPR#1089: Consider arrays of length zero as constants
- PR#7501, GPR#1089: Consider arrays of length zero as constants
- MPR#7501, GPR#1089: Consider arrays of length zero as constants
Copy link
Member

Choose a reason for hiding this comment

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

The header line is duplicated, and the whole entry is duplicated from 4.04.1.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, fixed. (I think these issues come from a weird git fuzzy merge glitch, at least not from the 4.05 version.). I kept the change in trunk and removed the one in 4.04.1 -- I don't think this change was even available in 4.05.

@gasche gasche force-pushed the sync-trunk-Changes-with-4.05-Changes branch from f626455 to 3ec1afb Compare July 19, 2017 10:23
@gasche gasche merged commit d483d04 into ocaml:trunk Jul 19, 2017
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
* Add Merlin 2.0 announcement
* Split opam and opam-publish announcements

Co-authored-by: R. Boujbel <[email protected]>
Co-authored-by: Thibaut Mattio <[email protected]>
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