Merge in the release branches #5109
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Bake ignored/disallow data into the normalization data after all. * Make public operations available via a dedicated wrapper type instead of the main normalizer types. Closes unicode-org#2850
The assert was probably meant to ensure the complete year has at least 14 days, and not that the given day is at least the 14th day of the year Fixes: unicode-org#4977 (cherry picked from commit e83fd9b)
unicode-org#4977 (cherry picked from commit fe96085)
Fixes unicode-org#4968 I'd like to make a release for this one because it's a one-line change and we're already working on a patch release. (cherry picked from commit ad65b6d)
Fixes size regression noted by @zbraniecki (cherry picked from commit 9d7c332)
Fixes unicode-org#5039 Caused by rust-lang/rust#125360. We were assuming that `packed` meant `C, packed` already. This is an assumption I've seen throughout the Rust ecosystem so there may be reasons to revert.
Uplifts unicode-org#5049 to 1.5.x
Uplifts unicode-org#5049 to 1.4.x Not strictly necessary as per policy, but might be nice to do anyway?
Manishearth
added a commit
that referenced
this pull request
Jun 25, 2024
This includes CHANGELOG updates from #5079, #5080, (not #5091, it didn't include a changelog update, we weren't doing changelogs back then) alternative to #5109 <!-- Thank you for your pull request to ICU4X! Reminder: try to use [Conventional Comments](https://conventionalcomments.org/) to make comments clearer. Please see https://github.com/unicode-org/icu4x/blob/main/CONTRIBUTING.md for general information on contributing to ICU4X. -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges release branches from #5079, #5080, #5091 to main, using
git merge -s ours, and then adds CHANGELOG changes to them so that our main changelog stays up to date.The only thing changed by this PR should be the changelogs.
This should be merged with the merge commit strategy (this is a draft to prevent someone accidentally merging the usual way)
Alternative to #5110