Merge main to the idna-v1x branch #964
Merged
Conversation
This file contains 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
* Revert "Reimplement idna on top of ICU4X (servo#923)" This reverts commit 3d6dbbb. See servo#937 for reasons behind this backout. * Bump url version to 2.5.2 * Pin unicode-width to 0.1.12 to avoid build failure in rust 1.56 * Remove ambiguous_wide_pointer_comparisons to maybe resolve clippy error * fix clippy
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## idna-v1x #964 +/- ##
============================================
- Coverage 79.93% 79.76% -0.18%
============================================
Files 23 23
Lines 4227 4226 -1
============================================
- Hits 3379 3371 -8
- Misses 848 855 +7 ☔ View full report in Codecov by Sentry. |
|
The same CI runs also failed in #963 |
valenting
approved these changes
Sep 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The point of this merge is to have commit 54346fa in this branch but in a way where the merge node makes it pretty much go away so that merging from idna-v1x to main in the future becomes feasible without the old revert blowing away the idna 1.0.x code.