Skip to content

Merge branch release/1.1 to main#358

Merged
lorentey merged 93 commits intoapple:mainfrom
lorentey:merge.1.1→main
Feb 8, 2024

Hidden character warning

The head ref may contain hidden characters: "merge.1.1\u2192main"
Merged

Merge branch release/1.1 to main#358
lorentey merged 93 commits intoapple:mainfrom
lorentey:merge.1.1→main

Conversation

@lorentey
Copy link
Copy Markdown
Member

@lorentey lorentey commented Feb 8, 2024

This merges all changes in the recently shipped 1.1.0 release to the main development branch of this package.

Checklist

  • I've read the Contribution Guidelines
  • My contributions are licensed under the Swift license.
  • I've followed the coding style of the rest of the project.
  • I've added tests covering all new code paths my change adds to the project (if appropriate).
  • I've added benchmarks covering new functionality (if appropriate).
  • I've verified that my change does not break any existing tests or introduce unexplained benchmark regressions.
  • I've updated the documentation if necessary.

lorentey and others added 30 commits November 14, 2023 18:52
With this tweak, we should be able to build the package in debug mode
even on Windows.  We always use the release mode DLL form of the C/C++
runtime on Windows and can build the Swift code in Debug or Release mode
optimizations.
With this tweak, we should be able to build the package in debug mode
even on Windows.  We always use the release mode DLL form of the C/C++
runtime on Windows and can build the Swift code in Debug or Release mode
optimizations.
build: support building in Debug mode on Windows
build: support building in Debug mode on Windows
Correct the path to allow using swift-collections embedded in a larger
project.  This is meant to assist with building LSP with vendored
dependencies.
build: tweak search path for embedding
Co-authored-by: Karoy Lorentey <klorentey@apple.com>
Co-authored-by: Karoy Lorentey <klorentey@apple.com>
Co-authored-by: Karoy Lorentey <klorentey@apple.com>
…onary-values-equality

[OrderedDictionary] forward ordered dictionary values equality to values property
Co-authored-by: Karoy Lorentey <klorentey@apple.com>
Co-authored-by: Karoy Lorentey <klorentey@apple.com>
Co-authored-by: Karoy Lorentey <klorentey@apple.com>
Co-authored-by: Karoy Lorentey <klorentey@apple.com>
…quality

[OrderedSet] forward ordered set equality to elements property
lorentey and others added 26 commits January 31, 2024 19:34
Our updated minimum toolchain requirement is Swift 5.7, and the stdlib in that version has the fix included.

We’ve seen reports that the bug may not deploy back in all cases to earlier OS releases, but it still seems worth trying to remove the workaround, as it has some undesirable runtime implications.
- Don’t print the type name
- Include some information identifying the heap instance
…hmarks

[Benchmarks] Add Collection Equality Benchmarks
# Conflicts:
#	Sources/SortedCollections/BTree/_BTree+BidirectionalCollection.swift
#	Sources/SortedCollections/BTree/_BTree+UnsafeCursor.swift
#	Sources/SortedCollections/BTree/_BTree.Builder.swift
#	Sources/SortedCollections/BTree/_BTree.swift
#	Sources/SortedCollections/BTree/_Node.Splinter.swift
#	Sources/SortedCollections/BTree/_Node.Storage.swift
#	Sources/SortedCollections/BTree/_Node.UnsafeHandle+Insertion.swift
#	Sources/SortedCollections/BTree/_Node.swift
#	Tests/SortedCollectionsTests/BTree/Node+Join Tests.swift
…ry-keys-equality

[TreeDictionary][Keys] Add Equatable and Hashable Conformance to TreeDictionary.Keys
# Conflicts:
#	CMakeLists.txt
#	README.md
@lorentey
Copy link
Copy Markdown
Member Author

lorentey commented Feb 8, 2024

@swift-ci test

@lorentey lorentey merged commit 73471fc into apple:main Feb 8, 2024
@lorentey lorentey deleted the merge.1.1→main branch February 8, 2024 09:04
@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.

4 participants