Merge release/1.1 to main #386
Merged
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
…se-1.1 Add post-merge CI support for release/1.1 branch
…e-module Rename RopeModule to _RopeModule in CMakeLists.txt to match Package.swift
(cherry picked from commit e3954cd)
- Currently OrderedCollections cmake incorrectly list "Utilities/_UnsafeBitSet.swift" instead of "Utilities/_UnsafeBitset.swift", causing build failures
…ections-cmake Fix the incorrect file name in OrderedCollections cmake file
A non-unique reference to a storage instance can legitimately become unique at any point, due to other references (say, held, by another thread) getting destroyed. `Deque`’s `ensureUnique` implementation currently invokes the uniqueness check two times in quick succession, expecting it to return false both times. In rare circumstances, this can lead to a spurious trap in concurrent environments. Fix this by avoiding calling `isUnique` more than once.
[Deque]: Fix bogus assert in Deque._Storage._ensureUnique
[test] TreeDictionary.Keys: Remove stray print that’s flooding test output
We are forced to do this due to an Xcode issue (apple#364) with underscored module names. This module remains unstable, despite the removal of the underscore. Directly importing it from outside the package remains unsupported. This module and/or its entire contents may go away or change in incompatible ways in any future swift-collections release.
Rename _CollectionsUtilities to InternalCollectionsUtilities
Rope.join has a logic error where it fails to properly ensure uniqueness of child node references before zipping the two b-trees together. rdar://128450202
[Rope] Fix copy-on-write violation in Rope.join
* Add new single-module and foundation-toolchain-module modes to CMake build * Fix allowable client flag syntax
# Conflicts: # .swiftci/5_10_ubuntu2204 # .swiftci/5_7_ubuntu2204 # .swiftci/5_8_ubuntu2204 # .swiftci/5_9_ubuntu2204 # .swiftci/nightly_6_0_macos # .swiftci/nightly_6_0_ubuntu2204 # .swiftci/nightly_main_macos # .swiftci/nightly_main_ubuntu2204
Member
Author
|
@swift-ci test |
Member
Author
|
D'oh, the manifest needs updates. |
Member
Author
|
@swift-ci test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Sync main with recent changes that landed on release/1.1.