Skip to content

Conversation

@lorentey
Copy link
Member

This is a manual merge of recent changes from release/1.1 to main.

lorentey and others added 30 commits May 18, 2023 18:18
It turns out `UInt.bitWidth` is getting too eagerly inlined, so conditions based on it trigger spurious “code will never be executed” warnings. Silence those by switching to looking at `MemoryLayout<UInt>`, which doesn’t get turned into a constant *that* early.
[CollectionUtilities] Silence a warning on 32 bit platforms
[BitSet] Fix a thinko in BitSet.isEqualSet
Grab bag of fixes for small test issues
[Xcode] Set a code sign identity in the Xcode project
Rope: Fix trap when replaceSubrange is called on an empty rope
`Rope.find` returns a bogus remainder for the end position
Fix typo

Replace this paragraph with a description of your changes and rationale. Provide links to an existing issue or external references/discussions, if appropriate.
- For CustomStringConvertible, `description` should print elements using `String(reflecting:)` rather than `String(describing:)`, to avoid element output from interfering with syntactically relevant punctuation within structured list displays.
- To make this work without making displays overly verbose, make `debugDescription` mostly the same as `description`, except for escaping raw string displays when and if needed.
- Avoid printing type names in `debugDescription` — it is generally not helpful, as the type is already easily accessible elsewhere. Including it makes for overly verbose displays when the type serves as an Element of a collection.
- Avoid having `debugDescription` return the empty string — it can be confusing when such a description appears in list displays.

Resolves apple#301.
Fix CustomStringConvertible/CustomDebugStringConvertible conformances
[1.0][test] Fix typename shadowing warning in Swift 5.9
[1.0][benchmark] Update std::function syntax for current C++
[RopeModule] Fix issues in Swift's ABI stable dialect
[CMake, Xcode] Update configurations for alternate build systems
These render the emitted .swiftinterface unusable when the module is built with library evolution enabled.
…ases

[RopeModule] Remove unnecessary typealiases
kati-kms and others added 11 commits November 10, 2023 15:38
Fix typos: OrderedSet Documentation
[Heap] insert(contentsOf:) Switch to Floyd’s if we’re inserting too many items
# Conflicts:
#	Tests/_CollectionsTestSupport/MinimalTypes/MinimalDecoder.swift
# Conflicts:
#	Sources/BitCollections/CMakeLists.txt
#	Sources/HashTreeCollections/CMakeLists.txt
@lorentey
Copy link
Member Author

@swift-ci test

@lorentey lorentey merged commit 27432cc into apple:main Nov 27, 2023
@lorentey lorentey deleted the merge.2023-11-27.release-1.1→main branch November 27, 2023 21:57
@lorentey lorentey added this to the 1.3.0 milestone Sep 27, 2025
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