From 35d5746117b42a556f81cff9fe016fdff8a6ddaa Mon Sep 17 00:00:00 2001 From: Karoy Lorentey Date: Wed, 29 May 2024 14:00:13 -0700 Subject: [PATCH] Rename _CollectionsUtilities to InternalCollectionsUtilities We are forced to do this due to an Xcode issue (#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. --- Package.swift | 16 ++++++++-------- .../BitArray/BitArray+ChunkedBitsIterators.swift | 2 +- .../BitCollections/BitArray/BitArray+Copy.swift | 2 +- .../BitArray/BitArray+Invariants.swift | 2 +- .../BitArray+RangeReplaceableCollection.swift | 2 +- .../BitArray/BitArray._UnsafeHandle.swift | 2 +- Sources/BitCollections/BitArray/BitArray.swift | 2 +- .../BitSet/BitSet+CustomStringConvertible.swift | 2 +- .../BitCollections/BitSet/BitSet+Extras.swift | 2 +- .../BitSet/BitSet+Initializers.swift | 2 +- .../BitSet/BitSet+Invariants.swift | 2 +- .../BitSet+SetAlgebra formIntersection.swift | 2 +- ...tSet+SetAlgebra formSymmetricDifference.swift | 2 +- .../BitSet/BitSet+SetAlgebra formUnion.swift | 2 +- .../BitSet/BitSet+SetAlgebra intersection.swift | 2 +- .../BitSet/BitSet+SetAlgebra isDisjoint.swift | 2 +- .../BitSet/BitSet+SetAlgebra isEqualSet.swift | 2 +- .../BitSet+SetAlgebra isStrictSubset.swift | 2 +- .../BitSet+SetAlgebra isStrictSuperset.swift | 2 +- .../BitSet/BitSet+SetAlgebra isSubset.swift | 2 +- .../BitSet/BitSet+SetAlgebra isSuperset.swift | 2 +- .../BitSet/BitSet+SetAlgebra subtract.swift | 2 +- .../BitSet/BitSet+SetAlgebra subtracting.swift | 2 +- .../BitSet+SetAlgebra symmetricDifference.swift | 2 +- .../BitSet/BitSet+SetAlgebra union.swift | 2 +- .../BitSet/BitSet+Sorted Collection APIs.swift | 2 +- .../BitCollections/BitSet/BitSet.Counted.swift | 2 +- Sources/BitCollections/BitSet/BitSet.Index.swift | 2 +- .../BitSet/BitSet._UnsafeHandle.swift | 2 +- Sources/BitCollections/BitSet/BitSet.swift | 2 +- Sources/BitCollections/CMakeLists.txt | 2 +- Sources/BitCollections/Shared/UInt+Tricks.swift | 2 +- Sources/BitCollections/Shared/_Word.swift | 2 +- Sources/CMakeLists.txt | 2 +- Sources/DequeModule/CMakeLists.txt | 2 +- Sources/DequeModule/Deque+Collection.swift | 2 +- Sources/DequeModule/Deque+Descriptions.swift | 2 +- Sources/DequeModule/Deque+Extras.swift | 2 +- Sources/DequeModule/Deque+Testing.swift | 2 +- Sources/DequeModule/_UnsafeWrappedBuffer.swift | 2 +- Sources/HashTreeCollections/CMakeLists.txt | 2 +- .../HashTreeCollections/HashNode/_Bitmap.swift | 2 +- .../HashNode/_HashNode+Debugging.swift | 2 +- .../HashNode/_HashNode+Initializers.swift | 2 +- .../HashNode/_HashNode+Storage.swift | 2 +- .../_HashNode+Structural mapValues.swift | 2 +- .../HashNode/_HashNode+Subtree Insertions.swift | 2 +- .../HashNode/_UnmanagedHashNode.swift | 2 +- .../TreeDictionary+Debugging.swift | 2 +- .../TreeDictionary+Descriptions.swift | 2 +- .../TreeDictionary+Initializers.swift | 2 +- .../TreeDictionary/TreeDictionary+Keys.swift | 2 +- .../TreeDictionary/TreeDictionary+Values.swift | 2 +- .../TreeSet/TreeSet+Debugging.swift | 2 +- .../TreeSet/TreeSet+Descriptions.swift | 2 +- .../TreeSet/TreeSet+Equatable.swift | 2 +- .../TreeSet/TreeSet+Extras.swift | 2 +- .../TreeSet+SetAlgebra Initializers.swift | 2 +- .../TreeSet/TreeSet+SetAlgebra basics.swift | 2 +- .../TreeSet+SetAlgebra intersection.swift | 2 +- .../TreeSet/TreeSet+SetAlgebra isDisjoint.swift | 2 +- .../TreeSet/TreeSet+SetAlgebra isEqualSet.swift | 2 +- .../TreeSet+SetAlgebra isStrictSubset.swift | 2 +- .../TreeSet+SetAlgebra isStrictSuperset.swift | 2 +- .../TreeSet/TreeSet+SetAlgebra isSubset.swift | 2 +- .../TreeSet/TreeSet+SetAlgebra isSuperset.swift | 2 +- .../TreeSet/TreeSet+SetAlgebra subtracting.swift | 2 +- .../TreeSet+SetAlgebra symmetricDifference.swift | 2 +- .../TreeSet/TreeSet+SetAlgebra union.swift | 2 +- Sources/HeapModule/CMakeLists.txt | 2 +- Sources/HeapModule/Heap+Invariants.swift | 2 +- .../CMakeLists.txt | 8 ++++---- .../UnsafeMutableBufferPointer+SE-0370.swift.gyb | 0 .../UnsafeMutablePointer+SE-0370.swift.gyb | 0 .../UnsafeRawPointer extensions.swift.gyb | 0 .../UnsafeMutableBufferPointer+SE-0370.swift | 0 .../UnsafeMutablePointer+SE-0370.swift | 0 .../UnsafeRawPointer extensions.swift | 0 .../Debugging.swift.gyb | 0 .../Descriptions.swift.gyb | 0 ...xedWidthInteger+roundUpToPowerOfTwo.swift.gyb | 0 .../IntegerTricks/Integer rank.swift.gyb | 0 .../UInt+first and last set bit.swift.gyb | 0 .../IntegerTricks/UInt+reversed.swift.gyb | 0 .../FixedWidthInteger+roundUpToPowerOfTwo.swift | 0 .../autogenerated/Integer rank.swift | 0 .../UInt+first and last set bit.swift | 0 .../autogenerated/UInt+reversed.swift | 0 .../RandomAccessCollection+Offsets.swift.gyb | 0 .../Specialize.swift.gyb | 0 .../UnsafeBitSet/_UnsafeBitSet+Index.swift.gyb | 0 .../UnsafeBitSet/_UnsafeBitSet+_Word.swift.gyb | 0 .../UnsafeBitSet/_UnsafeBitSet.swift.gyb | 0 .../autogenerated/_UnsafeBitSet+Index.swift | 0 .../autogenerated/_UnsafeBitSet+_Word.swift | 0 .../autogenerated/_UnsafeBitSet.swift | 0 .../UnsafeBufferPointer+Extras.swift.gyb | 0 .../UnsafeMutableBufferPointer+Extras.swift.gyb | 0 .../_SortedCollection.swift | 0 .../_UniqueCollection.swift | 0 .../autogenerated/Debugging.swift | 0 .../autogenerated/Descriptions.swift | 0 .../RandomAccessCollection+Offsets.swift | 0 .../autogenerated/Specialize.swift | 0 .../UnsafeBufferPointer+Extras.swift | 0 .../UnsafeMutableBufferPointer+Extras.swift | 0 Sources/OrderedCollections/CMakeLists.txt | 2 +- .../HashTable/_HashTable+UnsafeHandle.swift | 2 +- .../OrderedDictionary+Descriptions.swift | 2 +- .../OrderedDictionary+Elements.SubSequence.swift | 2 +- .../OrderedDictionary+Elements.swift | 2 +- .../OrderedDictionary+Initializers.swift | 2 +- .../OrderedDictionary+Invariants.swift | 2 +- .../OrderedDictionary+Values.swift | 2 +- .../OrderedSet/OrderedSet+Descriptions.swift | 2 +- .../OrderedSet/OrderedSet+Initializers.swift | 2 +- .../OrderedSet/OrderedSet+Invariants.swift | 2 +- .../OrderedSet+Partial MutableCollection.swift | 2 +- ...eredSet+Partial SetAlgebra intersection.swift | 2 +- ...rderedSet+Partial SetAlgebra isDisjoint.swift | 2 +- ...rderedSet+Partial SetAlgebra isEqualSet.swift | 2 +- ...edSet+Partial SetAlgebra isStrictSubset.swift | 2 +- ...Set+Partial SetAlgebra isStrictSuperset.swift | 2 +- .../OrderedSet+Partial SetAlgebra isSubset.swift | 2 +- ...rderedSet+Partial SetAlgebra isSuperset.swift | 2 +- ...deredSet+Partial SetAlgebra subtracting.swift | 2 +- ...+Partial SetAlgebra symmetricDifference.swift | 2 +- .../OrderedSet+RandomAccessCollection.swift | 2 +- .../OrderedSet/OrderedSet+SubSequence.swift | 2 +- .../OrderedSet/OrderedSet+Testing.swift | 2 +- .../OrderedSet/OrderedSet+UnorderedView.swift | 2 +- .../OrderedSet/OrderedSet.swift | 2 +- .../Utilities/_UnsafeBitset.swift | 4 ++-- .../BigString+RangeReplaceableCollection.swift | 2 +- .../Views/BigString+UnicodeScalarView.swift | 2 +- Sources/RopeModule/CMakeLists.txt | 2 +- .../RopeModule/Rope/Basics/Rope+Builder.swift | 2 +- .../RopeModule/Rope/Basics/Rope+Debugging.swift | 2 +- Sources/RopeModule/Rope/Basics/Rope+_Node.swift | 2 +- .../RandomAccessCollection+Extras.swift | 2 +- .../Utilities/SortedCollectionAPIChecker.swift | 2 +- Xcode/Collections.xcodeproj/project.pbxproj | 6 +++--- 142 files changed, 121 insertions(+), 121 deletions(-) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/CMakeLists.txt (84%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Compatibility/UnsafeMutableBufferPointer+SE-0370.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Compatibility/UnsafeMutablePointer+SE-0370.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Compatibility/UnsafeRawPointer extensions.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Compatibility/autogenerated/UnsafeMutableBufferPointer+SE-0370.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Compatibility/autogenerated/UnsafeMutablePointer+SE-0370.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Compatibility/autogenerated/UnsafeRawPointer extensions.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Debugging.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Descriptions.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/IntegerTricks/FixedWidthInteger+roundUpToPowerOfTwo.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/IntegerTricks/Integer rank.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/IntegerTricks/UInt+first and last set bit.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/IntegerTricks/UInt+reversed.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/IntegerTricks/autogenerated/FixedWidthInteger+roundUpToPowerOfTwo.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/IntegerTricks/autogenerated/Integer rank.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/IntegerTricks/autogenerated/UInt+first and last set bit.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/IntegerTricks/autogenerated/UInt+reversed.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/RandomAccessCollection+Offsets.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/Specialize.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/UnsafeBitSet/_UnsafeBitSet+Index.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/UnsafeBitSet/_UnsafeBitSet+_Word.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/UnsafeBitSet/_UnsafeBitSet.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/UnsafeBitSet/autogenerated/_UnsafeBitSet+Index.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/UnsafeBitSet/autogenerated/_UnsafeBitSet+_Word.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/UnsafeBitSet/autogenerated/_UnsafeBitSet.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/UnsafeBufferPointer+Extras.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/UnsafeMutableBufferPointer+Extras.swift.gyb (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/_SortedCollection.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/_UniqueCollection.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/autogenerated/Debugging.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/autogenerated/Descriptions.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/autogenerated/RandomAccessCollection+Offsets.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/autogenerated/Specialize.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/autogenerated/UnsafeBufferPointer+Extras.swift (100%) rename Sources/{_CollectionsUtilities => InternalCollectionsUtilities}/autogenerated/UnsafeMutableBufferPointer+Extras.swift (100%) diff --git a/Package.swift b/Package.swift index f4e09a05b..449364ce7 100644 --- a/Package.swift +++ b/Package.swift @@ -178,14 +178,14 @@ let targets: [CustomTarget] = [ .target( kind: .testSupport, name: "_CollectionsTestSupport", - dependencies: ["_CollectionsUtilities"]), + dependencies: ["InternalCollectionsUtilities"]), .target( kind: .test, name: "CollectionsTestSupportTests", dependencies: ["_CollectionsTestSupport"]), .target( kind: .hidden, - name: "_CollectionsUtilities", + name: "InternalCollectionsUtilities", exclude: [ "CMakeLists.txt", "Compatibility/UnsafeMutableBufferPointer+SE-0370.swift.gyb", @@ -209,7 +209,7 @@ let targets: [CustomTarget] = [ .target( kind: .exported, name: "BitCollections", - dependencies: ["_CollectionsUtilities"], + dependencies: ["InternalCollectionsUtilities"], exclude: ["CMakeLists.txt"]), .target( kind: .test, @@ -221,7 +221,7 @@ let targets: [CustomTarget] = [ .target( kind: .exported, name: "DequeModule", - dependencies: ["_CollectionsUtilities"], + dependencies: ["InternalCollectionsUtilities"], exclude: ["CMakeLists.txt"]), .target( kind: .test, @@ -231,7 +231,7 @@ let targets: [CustomTarget] = [ .target( kind: .exported, name: "HashTreeCollections", - dependencies: ["_CollectionsUtilities"], + dependencies: ["InternalCollectionsUtilities"], exclude: ["CMakeLists.txt"]), .target( kind: .test, @@ -241,7 +241,7 @@ let targets: [CustomTarget] = [ .target( kind: .exported, name: "HeapModule", - dependencies: ["_CollectionsUtilities"], + dependencies: ["InternalCollectionsUtilities"], exclude: ["CMakeLists.txt"]), .target( kind: .test, @@ -251,7 +251,7 @@ let targets: [CustomTarget] = [ .target( kind: .exported, name: "OrderedCollections", - dependencies: ["_CollectionsUtilities"], + dependencies: ["InternalCollectionsUtilities"], exclude: ["CMakeLists.txt"]), .target( kind: .test, @@ -261,7 +261,7 @@ let targets: [CustomTarget] = [ .target( kind: .exported, name: "_RopeModule", - dependencies: ["_CollectionsUtilities"], + dependencies: ["InternalCollectionsUtilities"], directory: "RopeModule", exclude: ["CMakeLists.txt"]), .target( diff --git a/Sources/BitCollections/BitArray/BitArray+ChunkedBitsIterators.swift b/Sources/BitCollections/BitArray/BitArray+ChunkedBitsIterators.swift index 6f1e1f015..2567e2fe7 100644 --- a/Sources/BitCollections/BitArray/BitArray+ChunkedBitsIterators.swift +++ b/Sources/BitCollections/BitArray/BitArray+ChunkedBitsIterators.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif internal struct _ChunkedBitsForwardIterator { diff --git a/Sources/BitCollections/BitArray/BitArray+Copy.swift b/Sources/BitCollections/BitArray/BitArray+Copy.swift index b261a2d9f..9507204c2 100644 --- a/Sources/BitCollections/BitArray/BitArray+Copy.swift +++ b/Sources/BitCollections/BitArray/BitArray+Copy.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitArray { diff --git a/Sources/BitCollections/BitArray/BitArray+Invariants.swift b/Sources/BitCollections/BitArray/BitArray+Invariants.swift index 4c97b0707..3f4cad34e 100644 --- a/Sources/BitCollections/BitArray/BitArray+Invariants.swift +++ b/Sources/BitCollections/BitArray/BitArray+Invariants.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitArray { diff --git a/Sources/BitCollections/BitArray/BitArray+RangeReplaceableCollection.swift b/Sources/BitCollections/BitArray/BitArray+RangeReplaceableCollection.swift index 1141b840c..93c8ffef5 100644 --- a/Sources/BitCollections/BitArray/BitArray+RangeReplaceableCollection.swift +++ b/Sources/BitCollections/BitArray/BitArray+RangeReplaceableCollection.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitArray: RangeReplaceableCollection {} diff --git a/Sources/BitCollections/BitArray/BitArray._UnsafeHandle.swift b/Sources/BitCollections/BitArray/BitArray._UnsafeHandle.swift index 680a70456..bd314e99e 100644 --- a/Sources/BitCollections/BitArray/BitArray._UnsafeHandle.swift +++ b/Sources/BitCollections/BitArray/BitArray._UnsafeHandle.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitArray { diff --git a/Sources/BitCollections/BitArray/BitArray.swift b/Sources/BitCollections/BitArray/BitArray.swift index 956e23841..43884f140 100644 --- a/Sources/BitCollections/BitArray/BitArray.swift +++ b/Sources/BitCollections/BitArray/BitArray.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif /// An ordered, random-access collection of `Bool` values, implemented as an diff --git a/Sources/BitCollections/BitSet/BitSet+CustomStringConvertible.swift b/Sources/BitCollections/BitSet/BitSet+CustomStringConvertible.swift index 773043fcf..266516a7f 100644 --- a/Sources/BitCollections/BitSet/BitSet+CustomStringConvertible.swift +++ b/Sources/BitCollections/BitSet/BitSet+CustomStringConvertible.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet: CustomStringConvertible { diff --git a/Sources/BitCollections/BitSet/BitSet+Extras.swift b/Sources/BitCollections/BitSet/BitSet+Extras.swift index 242b74829..15b8a391d 100644 --- a/Sources/BitCollections/BitSet/BitSet+Extras.swift +++ b/Sources/BitCollections/BitSet/BitSet+Extras.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet: _UniqueCollection {} diff --git a/Sources/BitCollections/BitSet/BitSet+Initializers.swift b/Sources/BitCollections/BitSet/BitSet+Initializers.swift index 495135d3e..a3ee066f9 100644 --- a/Sources/BitCollections/BitSet/BitSet+Initializers.swift +++ b/Sources/BitCollections/BitSet/BitSet+Initializers.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+Invariants.swift b/Sources/BitCollections/BitSet/BitSet+Invariants.swift index 693f5d183..ba8df72c0 100644 --- a/Sources/BitCollections/BitSet/BitSet+Invariants.swift +++ b/Sources/BitCollections/BitSet/BitSet+Invariants.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra formIntersection.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra formIntersection.swift index daae4a90e..454df0997 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra formIntersection.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra formIntersection.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra formSymmetricDifference.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra formSymmetricDifference.swift index 5b78eeea2..7778dda9d 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra formSymmetricDifference.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra formSymmetricDifference.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra formUnion.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra formUnion.swift index 993e6e3f3..034745b2c 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra formUnion.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra formUnion.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra intersection.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra intersection.swift index b75f8d4e0..ac7084ab6 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra intersection.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra intersection.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isDisjoint.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isDisjoint.swift index 5817c0847..28207c569 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isDisjoint.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isDisjoint.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isEqualSet.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isEqualSet.swift index 712bef694..62f190cab 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isEqualSet.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isEqualSet.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // FIXME: These are non-standard extensions generalizing ==. diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isStrictSubset.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isStrictSubset.swift index 1acf2509b..5ec63e5da 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isStrictSubset.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isStrictSubset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isStrictSuperset.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isStrictSuperset.swift index 4226f604a..d0230eb4b 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isStrictSuperset.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isStrictSuperset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isSubset.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isSubset.swift index da13d34fa..45863ec75 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isSubset.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isSubset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isSuperset.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isSuperset.swift index 91db1c63d..7e77bc8aa 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra isSuperset.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra isSuperset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra subtract.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra subtract.swift index 0243ab31a..9b8c1c0dc 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra subtract.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra subtract.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra subtracting.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra subtracting.swift index 9397d9103..4d7a1d7af 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra subtracting.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra subtracting.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra symmetricDifference.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra symmetricDifference.swift index 43b1e9d76..634aa844d 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra symmetricDifference.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra symmetricDifference.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+SetAlgebra union.swift b/Sources/BitCollections/BitSet/BitSet+SetAlgebra union.swift index 58e25dbb6..57d6500fa 100644 --- a/Sources/BitCollections/BitSet/BitSet+SetAlgebra union.swift +++ b/Sources/BitCollections/BitSet/BitSet+SetAlgebra union.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet+Sorted Collection APIs.swift b/Sources/BitCollections/BitSet/BitSet+Sorted Collection APIs.swift index 513c8b253..1505646e9 100644 --- a/Sources/BitCollections/BitSet/BitSet+Sorted Collection APIs.swift +++ b/Sources/BitCollections/BitSet/BitSet+Sorted Collection APIs.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet: _SortedCollection { diff --git a/Sources/BitCollections/BitSet/BitSet.Counted.swift b/Sources/BitCollections/BitSet/BitSet.Counted.swift index d8435c6bb..f8c805a1c 100644 --- a/Sources/BitCollections/BitSet/BitSet.Counted.swift +++ b/Sources/BitCollections/BitSet/BitSet.Counted.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet.Index.swift b/Sources/BitCollections/BitSet/BitSet.Index.swift index 45c28f8fe..3cc67231c 100644 --- a/Sources/BitCollections/BitSet/BitSet.Index.swift +++ b/Sources/BitCollections/BitSet/BitSet.Index.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet._UnsafeHandle.swift b/Sources/BitCollections/BitSet/BitSet._UnsafeHandle.swift index 5e717b49d..cf6a1d3fb 100644 --- a/Sources/BitCollections/BitSet/BitSet._UnsafeHandle.swift +++ b/Sources/BitCollections/BitSet/BitSet._UnsafeHandle.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension BitSet { diff --git a/Sources/BitCollections/BitSet/BitSet.swift b/Sources/BitCollections/BitSet/BitSet.swift index 79cd0d467..82cc66cd7 100644 --- a/Sources/BitCollections/BitSet/BitSet.swift +++ b/Sources/BitCollections/BitSet/BitSet.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif /// A sorted collection of small nonnegative integers, implemented as an diff --git a/Sources/BitCollections/CMakeLists.txt b/Sources/BitCollections/CMakeLists.txt index 25aedb54a..837cab503 100644 --- a/Sources/BitCollections/CMakeLists.txt +++ b/Sources/BitCollections/CMakeLists.txt @@ -66,7 +66,7 @@ add_library(BitCollections "Shared/_Word.swift" ) target_link_libraries(BitCollections PRIVATE - _CollectionsUtilities) + InternalCollectionsUtilities) set_target_properties(BitCollections PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) diff --git a/Sources/BitCollections/Shared/UInt+Tricks.swift b/Sources/BitCollections/Shared/UInt+Tricks.swift index 8040d031e..c05bbe38f 100644 --- a/Sources/BitCollections/Shared/UInt+Tricks.swift +++ b/Sources/BitCollections/Shared/UInt+Tricks.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension UInt { diff --git a/Sources/BitCollections/Shared/_Word.swift b/Sources/BitCollections/Shared/_Word.swift index 64b331c8f..0917a491c 100644 --- a/Sources/BitCollections/Shared/_Word.swift +++ b/Sources/BitCollections/Shared/_Word.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif @usableFromInline diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 2ab9a5942..988bc2106 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -14,4 +14,4 @@ add_subdirectory(HashTreeCollections) add_subdirectory(HeapModule) add_subdirectory(OrderedCollections) add_subdirectory(RopeModule) -add_subdirectory(_CollectionsUtilities) +add_subdirectory(InternalCollectionsUtilities) diff --git a/Sources/DequeModule/CMakeLists.txt b/Sources/DequeModule/CMakeLists.txt index fa04ca91d..bb92f8733 100644 --- a/Sources/DequeModule/CMakeLists.txt +++ b/Sources/DequeModule/CMakeLists.txt @@ -27,7 +27,7 @@ add_library(DequeModule "_UnsafeWrappedBuffer.swift" ) target_link_libraries(DequeModule PRIVATE - _CollectionsUtilities) + InternalCollectionsUtilities) set_target_properties(DequeModule PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) diff --git a/Sources/DequeModule/Deque+Collection.swift b/Sources/DequeModule/Deque+Collection.swift index 5eed96098..b56772cb4 100644 --- a/Sources/DequeModule/Deque+Collection.swift +++ b/Sources/DequeModule/Deque+Collection.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension Deque: Sequence { diff --git a/Sources/DequeModule/Deque+Descriptions.swift b/Sources/DequeModule/Deque+Descriptions.swift index 734f6c749..921a58310 100644 --- a/Sources/DequeModule/Deque+Descriptions.swift +++ b/Sources/DequeModule/Deque+Descriptions.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension Deque: CustomStringConvertible { diff --git a/Sources/DequeModule/Deque+Extras.swift b/Sources/DequeModule/Deque+Extras.swift index 4d7d126f8..850e493fe 100644 --- a/Sources/DequeModule/Deque+Extras.swift +++ b/Sources/DequeModule/Deque+Extras.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension Deque { diff --git a/Sources/DequeModule/Deque+Testing.swift b/Sources/DequeModule/Deque+Testing.swift index ea26e278c..0136886b9 100644 --- a/Sources/DequeModule/Deque+Testing.swift +++ b/Sources/DequeModule/Deque+Testing.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // This file contains exported but non-public entry points to support clear box diff --git a/Sources/DequeModule/_UnsafeWrappedBuffer.swift b/Sources/DequeModule/_UnsafeWrappedBuffer.swift index b51a5caca..1faefacc0 100644 --- a/Sources/DequeModule/_UnsafeWrappedBuffer.swift +++ b/Sources/DequeModule/_UnsafeWrappedBuffer.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif @frozen diff --git a/Sources/HashTreeCollections/CMakeLists.txt b/Sources/HashTreeCollections/CMakeLists.txt index d35c668d3..14587f7bf 100644 --- a/Sources/HashTreeCollections/CMakeLists.txt +++ b/Sources/HashTreeCollections/CMakeLists.txt @@ -95,7 +95,7 @@ add_library(HashTreeCollections "TreeSet/TreeSet.swift" ) target_link_libraries(HashTreeCollections PRIVATE - _CollectionsUtilities) + InternalCollectionsUtilities) set_target_properties(HashTreeCollections PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) diff --git a/Sources/HashTreeCollections/HashNode/_Bitmap.swift b/Sources/HashTreeCollections/HashNode/_Bitmap.swift index e8e453fa2..f5ec4e79e 100644 --- a/Sources/HashTreeCollections/HashNode/_Bitmap.swift +++ b/Sources/HashTreeCollections/HashNode/_Bitmap.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif /// A set of `_Bucket` values, represented by a 32-bit wide bitset. diff --git a/Sources/HashTreeCollections/HashNode/_HashNode+Debugging.swift b/Sources/HashTreeCollections/HashNode/_HashNode+Debugging.swift index 02f6c990c..1bfffe2ad 100644 --- a/Sources/HashTreeCollections/HashNode/_HashNode+Debugging.swift +++ b/Sources/HashTreeCollections/HashNode/_HashNode+Debugging.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension _HashNode { diff --git a/Sources/HashTreeCollections/HashNode/_HashNode+Initializers.swift b/Sources/HashTreeCollections/HashNode/_HashNode+Initializers.swift index e518eeea5..da6722d3c 100644 --- a/Sources/HashTreeCollections/HashNode/_HashNode+Initializers.swift +++ b/Sources/HashTreeCollections/HashNode/_HashNode+Initializers.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension _HashNode { diff --git a/Sources/HashTreeCollections/HashNode/_HashNode+Storage.swift b/Sources/HashTreeCollections/HashNode/_HashNode+Storage.swift index c37e07ba5..0aefeb848 100644 --- a/Sources/HashTreeCollections/HashNode/_HashNode+Storage.swift +++ b/Sources/HashTreeCollections/HashNode/_HashNode+Storage.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif /// A base representation of a hash tree node, capturing functionality diff --git a/Sources/HashTreeCollections/HashNode/_HashNode+Structural mapValues.swift b/Sources/HashTreeCollections/HashNode/_HashNode+Structural mapValues.swift index 4f54d28a4..740b0e147 100644 --- a/Sources/HashTreeCollections/HashNode/_HashNode+Structural mapValues.swift +++ b/Sources/HashTreeCollections/HashNode/_HashNode+Structural mapValues.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension _HashNode { diff --git a/Sources/HashTreeCollections/HashNode/_HashNode+Subtree Insertions.swift b/Sources/HashTreeCollections/HashNode/_HashNode+Subtree Insertions.swift index 0f7e4367c..d75b988be 100644 --- a/Sources/HashTreeCollections/HashNode/_HashNode+Subtree Insertions.swift +++ b/Sources/HashTreeCollections/HashNode/_HashNode+Subtree Insertions.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension _HashNode { diff --git a/Sources/HashTreeCollections/HashNode/_UnmanagedHashNode.swift b/Sources/HashTreeCollections/HashNode/_UnmanagedHashNode.swift index cb3872f2b..8baeea496 100644 --- a/Sources/HashTreeCollections/HashNode/_UnmanagedHashNode.swift +++ b/Sources/HashTreeCollections/HashNode/_UnmanagedHashNode.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif /// An unsafe, unowned, type-erased reference to a hash tree node; essentially diff --git a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Debugging.swift b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Debugging.swift index 9b8d78f1c..67f521cb1 100644 --- a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Debugging.swift +++ b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Debugging.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeDictionary { diff --git a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Descriptions.swift b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Descriptions.swift index 987eda624..0f510192d 100644 --- a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Descriptions.swift +++ b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Descriptions.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeDictionary: CustomStringConvertible { diff --git a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Initializers.swift b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Initializers.swift index 9fdb1b027..9d3385784 100644 --- a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Initializers.swift +++ b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Initializers.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeDictionary { diff --git a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Keys.swift b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Keys.swift index 7b6ac3ac0..6899581ea 100644 --- a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Keys.swift +++ b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Keys.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeDictionary { diff --git a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Values.swift b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Values.swift index b70110e21..aa646cfb0 100644 --- a/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Values.swift +++ b/Sources/HashTreeCollections/TreeDictionary/TreeDictionary+Values.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeDictionary { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+Debugging.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+Debugging.swift index a000f61d6..a76caa51c 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+Debugging.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+Debugging.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+Descriptions.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+Descriptions.swift index fd6a36a8a..b8219570c 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+Descriptions.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+Descriptions.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet: CustomStringConvertible { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+Equatable.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+Equatable.swift index 0d1022681..0617c57f1 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+Equatable.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+Equatable.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet: Equatable { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+Extras.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+Extras.swift index 9ed41206c..f02ac45f6 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+Extras.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+Extras.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet: _UniqueCollection {} diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra Initializers.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra Initializers.swift index 69cdac453..944ce4209 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra Initializers.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra Initializers.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra basics.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra basics.swift index a44705814..9d6b64652 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra basics.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra basics.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet: SetAlgebra { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra intersection.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra intersection.swift index 4235d50ee..f95eb755a 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra intersection.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra intersection.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isDisjoint.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isDisjoint.swift index e7d8f77d7..392a7b1fb 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isDisjoint.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isDisjoint.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isEqualSet.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isEqualSet.swift index 874b36d70..caaf194a1 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isEqualSet.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isEqualSet.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // FIXME: These are non-standard extensions generalizing ==. diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isStrictSubset.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isStrictSubset.swift index 821d81402..d7f1cd6a4 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isStrictSubset.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isStrictSubset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isStrictSuperset.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isStrictSuperset.swift index 4bc74f645..6e84cadc5 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isStrictSuperset.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isStrictSuperset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isSubset.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isSubset.swift index 95adf35e7..19fee624e 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isSubset.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isSubset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isSuperset.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isSuperset.swift index 49659d564..d5719948f 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isSuperset.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra isSuperset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra subtracting.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra subtracting.swift index 975dff00d..a661e3348 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra subtracting.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra subtracting.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra symmetricDifference.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra symmetricDifference.swift index 80ab38ce3..b22bf5271 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra symmetricDifference.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra symmetricDifference.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra union.swift b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra union.swift index ba60e400e..523dc7f5d 100644 --- a/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra union.swift +++ b/Sources/HashTreeCollections/TreeSet/TreeSet+SetAlgebra union.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension TreeSet { diff --git a/Sources/HeapModule/CMakeLists.txt b/Sources/HeapModule/CMakeLists.txt index 2fce017e0..3bc611fbd 100644 --- a/Sources/HeapModule/CMakeLists.txt +++ b/Sources/HeapModule/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(HeapModule "Heap+Invariants.swift" "Heap+UnsafeHandle.swift") target_link_libraries(HeapModule PRIVATE - _CollectionsUtilities) + InternalCollectionsUtilities) set_target_properties(HeapModule PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) diff --git a/Sources/HeapModule/Heap+Invariants.swift b/Sources/HeapModule/Heap+Invariants.swift index 94904ba91..5d1bfac41 100644 --- a/Sources/HeapModule/Heap+Invariants.swift +++ b/Sources/HeapModule/Heap+Invariants.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension Heap { diff --git a/Sources/_CollectionsUtilities/CMakeLists.txt b/Sources/InternalCollectionsUtilities/CMakeLists.txt similarity index 84% rename from Sources/_CollectionsUtilities/CMakeLists.txt rename to Sources/InternalCollectionsUtilities/CMakeLists.txt index 82c992068..bd38f9d99 100644 --- a/Sources/_CollectionsUtilities/CMakeLists.txt +++ b/Sources/InternalCollectionsUtilities/CMakeLists.txt @@ -7,7 +7,7 @@ Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information #]] -add_library(_CollectionsUtilities +add_library(InternalCollectionsUtilities "autogenerated/Debugging.swift" "autogenerated/Descriptions.swift" "autogenerated/RandomAccessCollection+Offsets.swift" @@ -27,8 +27,8 @@ add_library(_CollectionsUtilities "_SortedCollection.swift" "_UniqueCollection.swift" ) -set_target_properties(_CollectionsUtilities PROPERTIES +set_target_properties(InternalCollectionsUtilities PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) -_install_target(_CollectionsUtilities) -set_property(GLOBAL APPEND PROPERTY SWIFT_COLLECTIONS_EXPORTS _CollectionsUtilities) +_install_target(InternalCollectionsUtilities) +set_property(GLOBAL APPEND PROPERTY SWIFT_COLLECTIONS_EXPORTS InternalCollectionsUtilities) diff --git a/Sources/_CollectionsUtilities/Compatibility/UnsafeMutableBufferPointer+SE-0370.swift.gyb b/Sources/InternalCollectionsUtilities/Compatibility/UnsafeMutableBufferPointer+SE-0370.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/Compatibility/UnsafeMutableBufferPointer+SE-0370.swift.gyb rename to Sources/InternalCollectionsUtilities/Compatibility/UnsafeMutableBufferPointer+SE-0370.swift.gyb diff --git a/Sources/_CollectionsUtilities/Compatibility/UnsafeMutablePointer+SE-0370.swift.gyb b/Sources/InternalCollectionsUtilities/Compatibility/UnsafeMutablePointer+SE-0370.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/Compatibility/UnsafeMutablePointer+SE-0370.swift.gyb rename to Sources/InternalCollectionsUtilities/Compatibility/UnsafeMutablePointer+SE-0370.swift.gyb diff --git a/Sources/_CollectionsUtilities/Compatibility/UnsafeRawPointer extensions.swift.gyb b/Sources/InternalCollectionsUtilities/Compatibility/UnsafeRawPointer extensions.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/Compatibility/UnsafeRawPointer extensions.swift.gyb rename to Sources/InternalCollectionsUtilities/Compatibility/UnsafeRawPointer extensions.swift.gyb diff --git a/Sources/_CollectionsUtilities/Compatibility/autogenerated/UnsafeMutableBufferPointer+SE-0370.swift b/Sources/InternalCollectionsUtilities/Compatibility/autogenerated/UnsafeMutableBufferPointer+SE-0370.swift similarity index 100% rename from Sources/_CollectionsUtilities/Compatibility/autogenerated/UnsafeMutableBufferPointer+SE-0370.swift rename to Sources/InternalCollectionsUtilities/Compatibility/autogenerated/UnsafeMutableBufferPointer+SE-0370.swift diff --git a/Sources/_CollectionsUtilities/Compatibility/autogenerated/UnsafeMutablePointer+SE-0370.swift b/Sources/InternalCollectionsUtilities/Compatibility/autogenerated/UnsafeMutablePointer+SE-0370.swift similarity index 100% rename from Sources/_CollectionsUtilities/Compatibility/autogenerated/UnsafeMutablePointer+SE-0370.swift rename to Sources/InternalCollectionsUtilities/Compatibility/autogenerated/UnsafeMutablePointer+SE-0370.swift diff --git a/Sources/_CollectionsUtilities/Compatibility/autogenerated/UnsafeRawPointer extensions.swift b/Sources/InternalCollectionsUtilities/Compatibility/autogenerated/UnsafeRawPointer extensions.swift similarity index 100% rename from Sources/_CollectionsUtilities/Compatibility/autogenerated/UnsafeRawPointer extensions.swift rename to Sources/InternalCollectionsUtilities/Compatibility/autogenerated/UnsafeRawPointer extensions.swift diff --git a/Sources/_CollectionsUtilities/Debugging.swift.gyb b/Sources/InternalCollectionsUtilities/Debugging.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/Debugging.swift.gyb rename to Sources/InternalCollectionsUtilities/Debugging.swift.gyb diff --git a/Sources/_CollectionsUtilities/Descriptions.swift.gyb b/Sources/InternalCollectionsUtilities/Descriptions.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/Descriptions.swift.gyb rename to Sources/InternalCollectionsUtilities/Descriptions.swift.gyb diff --git a/Sources/_CollectionsUtilities/IntegerTricks/FixedWidthInteger+roundUpToPowerOfTwo.swift.gyb b/Sources/InternalCollectionsUtilities/IntegerTricks/FixedWidthInteger+roundUpToPowerOfTwo.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/IntegerTricks/FixedWidthInteger+roundUpToPowerOfTwo.swift.gyb rename to Sources/InternalCollectionsUtilities/IntegerTricks/FixedWidthInteger+roundUpToPowerOfTwo.swift.gyb diff --git a/Sources/_CollectionsUtilities/IntegerTricks/Integer rank.swift.gyb b/Sources/InternalCollectionsUtilities/IntegerTricks/Integer rank.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/IntegerTricks/Integer rank.swift.gyb rename to Sources/InternalCollectionsUtilities/IntegerTricks/Integer rank.swift.gyb diff --git a/Sources/_CollectionsUtilities/IntegerTricks/UInt+first and last set bit.swift.gyb b/Sources/InternalCollectionsUtilities/IntegerTricks/UInt+first and last set bit.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/IntegerTricks/UInt+first and last set bit.swift.gyb rename to Sources/InternalCollectionsUtilities/IntegerTricks/UInt+first and last set bit.swift.gyb diff --git a/Sources/_CollectionsUtilities/IntegerTricks/UInt+reversed.swift.gyb b/Sources/InternalCollectionsUtilities/IntegerTricks/UInt+reversed.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/IntegerTricks/UInt+reversed.swift.gyb rename to Sources/InternalCollectionsUtilities/IntegerTricks/UInt+reversed.swift.gyb diff --git a/Sources/_CollectionsUtilities/IntegerTricks/autogenerated/FixedWidthInteger+roundUpToPowerOfTwo.swift b/Sources/InternalCollectionsUtilities/IntegerTricks/autogenerated/FixedWidthInteger+roundUpToPowerOfTwo.swift similarity index 100% rename from Sources/_CollectionsUtilities/IntegerTricks/autogenerated/FixedWidthInteger+roundUpToPowerOfTwo.swift rename to Sources/InternalCollectionsUtilities/IntegerTricks/autogenerated/FixedWidthInteger+roundUpToPowerOfTwo.swift diff --git a/Sources/_CollectionsUtilities/IntegerTricks/autogenerated/Integer rank.swift b/Sources/InternalCollectionsUtilities/IntegerTricks/autogenerated/Integer rank.swift similarity index 100% rename from Sources/_CollectionsUtilities/IntegerTricks/autogenerated/Integer rank.swift rename to Sources/InternalCollectionsUtilities/IntegerTricks/autogenerated/Integer rank.swift diff --git a/Sources/_CollectionsUtilities/IntegerTricks/autogenerated/UInt+first and last set bit.swift b/Sources/InternalCollectionsUtilities/IntegerTricks/autogenerated/UInt+first and last set bit.swift similarity index 100% rename from Sources/_CollectionsUtilities/IntegerTricks/autogenerated/UInt+first and last set bit.swift rename to Sources/InternalCollectionsUtilities/IntegerTricks/autogenerated/UInt+first and last set bit.swift diff --git a/Sources/_CollectionsUtilities/IntegerTricks/autogenerated/UInt+reversed.swift b/Sources/InternalCollectionsUtilities/IntegerTricks/autogenerated/UInt+reversed.swift similarity index 100% rename from Sources/_CollectionsUtilities/IntegerTricks/autogenerated/UInt+reversed.swift rename to Sources/InternalCollectionsUtilities/IntegerTricks/autogenerated/UInt+reversed.swift diff --git a/Sources/_CollectionsUtilities/RandomAccessCollection+Offsets.swift.gyb b/Sources/InternalCollectionsUtilities/RandomAccessCollection+Offsets.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/RandomAccessCollection+Offsets.swift.gyb rename to Sources/InternalCollectionsUtilities/RandomAccessCollection+Offsets.swift.gyb diff --git a/Sources/_CollectionsUtilities/Specialize.swift.gyb b/Sources/InternalCollectionsUtilities/Specialize.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/Specialize.swift.gyb rename to Sources/InternalCollectionsUtilities/Specialize.swift.gyb diff --git a/Sources/_CollectionsUtilities/UnsafeBitSet/_UnsafeBitSet+Index.swift.gyb b/Sources/InternalCollectionsUtilities/UnsafeBitSet/_UnsafeBitSet+Index.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/UnsafeBitSet/_UnsafeBitSet+Index.swift.gyb rename to Sources/InternalCollectionsUtilities/UnsafeBitSet/_UnsafeBitSet+Index.swift.gyb diff --git a/Sources/_CollectionsUtilities/UnsafeBitSet/_UnsafeBitSet+_Word.swift.gyb b/Sources/InternalCollectionsUtilities/UnsafeBitSet/_UnsafeBitSet+_Word.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/UnsafeBitSet/_UnsafeBitSet+_Word.swift.gyb rename to Sources/InternalCollectionsUtilities/UnsafeBitSet/_UnsafeBitSet+_Word.swift.gyb diff --git a/Sources/_CollectionsUtilities/UnsafeBitSet/_UnsafeBitSet.swift.gyb b/Sources/InternalCollectionsUtilities/UnsafeBitSet/_UnsafeBitSet.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/UnsafeBitSet/_UnsafeBitSet.swift.gyb rename to Sources/InternalCollectionsUtilities/UnsafeBitSet/_UnsafeBitSet.swift.gyb diff --git a/Sources/_CollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet+Index.swift b/Sources/InternalCollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet+Index.swift similarity index 100% rename from Sources/_CollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet+Index.swift rename to Sources/InternalCollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet+Index.swift diff --git a/Sources/_CollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet+_Word.swift b/Sources/InternalCollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet+_Word.swift similarity index 100% rename from Sources/_CollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet+_Word.swift rename to Sources/InternalCollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet+_Word.swift diff --git a/Sources/_CollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet.swift b/Sources/InternalCollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet.swift similarity index 100% rename from Sources/_CollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet.swift rename to Sources/InternalCollectionsUtilities/UnsafeBitSet/autogenerated/_UnsafeBitSet.swift diff --git a/Sources/_CollectionsUtilities/UnsafeBufferPointer+Extras.swift.gyb b/Sources/InternalCollectionsUtilities/UnsafeBufferPointer+Extras.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/UnsafeBufferPointer+Extras.swift.gyb rename to Sources/InternalCollectionsUtilities/UnsafeBufferPointer+Extras.swift.gyb diff --git a/Sources/_CollectionsUtilities/UnsafeMutableBufferPointer+Extras.swift.gyb b/Sources/InternalCollectionsUtilities/UnsafeMutableBufferPointer+Extras.swift.gyb similarity index 100% rename from Sources/_CollectionsUtilities/UnsafeMutableBufferPointer+Extras.swift.gyb rename to Sources/InternalCollectionsUtilities/UnsafeMutableBufferPointer+Extras.swift.gyb diff --git a/Sources/_CollectionsUtilities/_SortedCollection.swift b/Sources/InternalCollectionsUtilities/_SortedCollection.swift similarity index 100% rename from Sources/_CollectionsUtilities/_SortedCollection.swift rename to Sources/InternalCollectionsUtilities/_SortedCollection.swift diff --git a/Sources/_CollectionsUtilities/_UniqueCollection.swift b/Sources/InternalCollectionsUtilities/_UniqueCollection.swift similarity index 100% rename from Sources/_CollectionsUtilities/_UniqueCollection.swift rename to Sources/InternalCollectionsUtilities/_UniqueCollection.swift diff --git a/Sources/_CollectionsUtilities/autogenerated/Debugging.swift b/Sources/InternalCollectionsUtilities/autogenerated/Debugging.swift similarity index 100% rename from Sources/_CollectionsUtilities/autogenerated/Debugging.swift rename to Sources/InternalCollectionsUtilities/autogenerated/Debugging.swift diff --git a/Sources/_CollectionsUtilities/autogenerated/Descriptions.swift b/Sources/InternalCollectionsUtilities/autogenerated/Descriptions.swift similarity index 100% rename from Sources/_CollectionsUtilities/autogenerated/Descriptions.swift rename to Sources/InternalCollectionsUtilities/autogenerated/Descriptions.swift diff --git a/Sources/_CollectionsUtilities/autogenerated/RandomAccessCollection+Offsets.swift b/Sources/InternalCollectionsUtilities/autogenerated/RandomAccessCollection+Offsets.swift similarity index 100% rename from Sources/_CollectionsUtilities/autogenerated/RandomAccessCollection+Offsets.swift rename to Sources/InternalCollectionsUtilities/autogenerated/RandomAccessCollection+Offsets.swift diff --git a/Sources/_CollectionsUtilities/autogenerated/Specialize.swift b/Sources/InternalCollectionsUtilities/autogenerated/Specialize.swift similarity index 100% rename from Sources/_CollectionsUtilities/autogenerated/Specialize.swift rename to Sources/InternalCollectionsUtilities/autogenerated/Specialize.swift diff --git a/Sources/_CollectionsUtilities/autogenerated/UnsafeBufferPointer+Extras.swift b/Sources/InternalCollectionsUtilities/autogenerated/UnsafeBufferPointer+Extras.swift similarity index 100% rename from Sources/_CollectionsUtilities/autogenerated/UnsafeBufferPointer+Extras.swift rename to Sources/InternalCollectionsUtilities/autogenerated/UnsafeBufferPointer+Extras.swift diff --git a/Sources/_CollectionsUtilities/autogenerated/UnsafeMutableBufferPointer+Extras.swift b/Sources/InternalCollectionsUtilities/autogenerated/UnsafeMutableBufferPointer+Extras.swift similarity index 100% rename from Sources/_CollectionsUtilities/autogenerated/UnsafeMutableBufferPointer+Extras.swift rename to Sources/InternalCollectionsUtilities/autogenerated/UnsafeMutableBufferPointer+Extras.swift diff --git a/Sources/OrderedCollections/CMakeLists.txt b/Sources/OrderedCollections/CMakeLists.txt index 5b2ca44d9..0b3604e63 100644 --- a/Sources/OrderedCollections/CMakeLists.txt +++ b/Sources/OrderedCollections/CMakeLists.txt @@ -72,7 +72,7 @@ add_library(OrderedCollections "Utilities/_UnsafeBitset.swift" ) target_link_libraries(OrderedCollections PRIVATE - _CollectionsUtilities) + InternalCollectionsUtilities) set_target_properties(OrderedCollections PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) diff --git a/Sources/OrderedCollections/HashTable/_HashTable+UnsafeHandle.swift b/Sources/OrderedCollections/HashTable/_HashTable+UnsafeHandle.swift index 40d833154..cfcf20dbe 100644 --- a/Sources/OrderedCollections/HashTable/_HashTable+UnsafeHandle.swift +++ b/Sources/OrderedCollections/HashTable/_HashTable+UnsafeHandle.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif @usableFromInline diff --git a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Descriptions.swift b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Descriptions.swift index 6caad1406..390a950bc 100644 --- a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Descriptions.swift +++ b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Descriptions.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedDictionary: CustomStringConvertible { diff --git a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Elements.SubSequence.swift b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Elements.SubSequence.swift index 18a8172a0..1a8319d61 100644 --- a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Elements.SubSequence.swift +++ b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Elements.SubSequence.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedDictionary.Elements { diff --git a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Elements.swift b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Elements.swift index e4cb08a69..a9ded44b0 100644 --- a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Elements.swift +++ b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Elements.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedDictionary { diff --git a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Initializers.swift b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Initializers.swift index 6fbfbc4fe..7c79df288 100644 --- a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Initializers.swift +++ b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Initializers.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedDictionary { diff --git a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Invariants.swift b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Invariants.swift index da0d6f534..b4fde02de 100644 --- a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Invariants.swift +++ b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Invariants.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedDictionary { diff --git a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Values.swift b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Values.swift index 2964d9836..ee2a4ac27 100644 --- a/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Values.swift +++ b/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary+Values.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedDictionary { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Descriptions.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Descriptions.swift index 725970b89..5db6aa98d 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Descriptions.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Descriptions.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet: CustomStringConvertible { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Initializers.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Initializers.swift index 83cfe08ca..16a7d66ac 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Initializers.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Initializers.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Invariants.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Invariants.swift index 8189a1f7f..c43872a2b 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Invariants.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Invariants.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial MutableCollection.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial MutableCollection.swift index 42376cc3f..12f0dfba6 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial MutableCollection.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial MutableCollection.swift @@ -12,7 +12,7 @@ // The parts of MutableCollection that OrderedSet is able to implement. #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra intersection.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra intersection.swift index 8ed990c9b..400214b4a 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra intersection.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra intersection.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // `OrderedSet` does not directly conform to `SetAlgebra` because its definition diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isDisjoint.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isDisjoint.swift index 1603008a3..c7f71e0f2 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isDisjoint.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isDisjoint.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // `OrderedSet` does not directly conform to `SetAlgebra` because its definition diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isEqualSet.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isEqualSet.swift index 665e4b7b1..9325cc7f6 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isEqualSet.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isEqualSet.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isStrictSubset.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isStrictSubset.swift index 0efe8ce9e..1c5d634f2 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isStrictSubset.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isStrictSubset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // `OrderedSet` does not directly conform to `SetAlgebra` because its definition diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isStrictSuperset.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isStrictSuperset.swift index 5e7747d2d..f0730acd3 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isStrictSuperset.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isStrictSuperset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // `OrderedSet` does not directly conform to `SetAlgebra` because its definition diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isSubset.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isSubset.swift index 038016cd2..8be7a22d4 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isSubset.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isSubset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // `OrderedSet` does not directly conform to `SetAlgebra` because its definition diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isSuperset.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isSuperset.swift index 932d2b0b7..b2f6f1302 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isSuperset.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra isSuperset.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // `OrderedSet` does not directly conform to `SetAlgebra` because its definition diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra subtracting.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra subtracting.swift index e7c91708f..7fbc374e9 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra subtracting.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra subtracting.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // `OrderedSet` does not directly conform to `SetAlgebra` because its definition diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra symmetricDifference.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra symmetricDifference.swift index ad81cc640..5015ee85c 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra symmetricDifference.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Partial SetAlgebra symmetricDifference.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif // `OrderedSet` does not directly conform to `SetAlgebra` because its definition diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+RandomAccessCollection.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+RandomAccessCollection.swift index 1a974800d..9539b8414 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+RandomAccessCollection.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+RandomAccessCollection.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet: Sequence { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+SubSequence.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+SubSequence.swift index 11eab1a16..38105e991 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+SubSequence.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+SubSequence.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+Testing.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+Testing.swift index 40b7d3d69..7ec3a4771 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+Testing.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+Testing.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet._UnstableInternals { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet+UnorderedView.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet+UnorderedView.swift index 9edede0bb..12bb94e86 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet+UnorderedView.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet+UnorderedView.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension OrderedSet { diff --git a/Sources/OrderedCollections/OrderedSet/OrderedSet.swift b/Sources/OrderedCollections/OrderedSet/OrderedSet.swift index 67f3958b4..ae1657197 100644 --- a/Sources/OrderedCollections/OrderedSet/OrderedSet.swift +++ b/Sources/OrderedCollections/OrderedSet/OrderedSet.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif /// An ordered collection of unique elements. diff --git a/Sources/OrderedCollections/Utilities/_UnsafeBitset.swift b/Sources/OrderedCollections/Utilities/_UnsafeBitset.swift index e188e525c..4365097a1 100644 --- a/Sources/OrderedCollections/Utilities/_UnsafeBitset.swift +++ b/Sources/OrderedCollections/Utilities/_UnsafeBitset.swift @@ -10,8 +10,8 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities @usableFromInline -internal typealias _UnsafeBitSet = _CollectionsUtilities._UnsafeBitSet +internal typealias _UnsafeBitSet = InternalCollectionsUtilities._UnsafeBitSet #endif diff --git a/Sources/RopeModule/BigString/Conformances/BigString+RangeReplaceableCollection.swift b/Sources/RopeModule/BigString/Conformances/BigString+RangeReplaceableCollection.swift index bb5f7844e..11ae4e4cb 100644 --- a/Sources/RopeModule/BigString/Conformances/BigString+RangeReplaceableCollection.swift +++ b/Sources/RopeModule/BigString/Conformances/BigString+RangeReplaceableCollection.swift @@ -12,7 +12,7 @@ #if swift(>=5.8) #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif @available(macOS 13.3, iOS 16.4, watchOS 9.4, tvOS 16.4, *) diff --git a/Sources/RopeModule/BigString/Views/BigString+UnicodeScalarView.swift b/Sources/RopeModule/BigString/Views/BigString+UnicodeScalarView.swift index c18e47e76..a68bebec8 100644 --- a/Sources/RopeModule/BigString/Views/BigString+UnicodeScalarView.swift +++ b/Sources/RopeModule/BigString/Views/BigString+UnicodeScalarView.swift @@ -12,7 +12,7 @@ #if swift(>=5.8) #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif @available(macOS 13.3, iOS 16.4, watchOS 9.4, tvOS 16.4, *) diff --git a/Sources/RopeModule/CMakeLists.txt b/Sources/RopeModule/CMakeLists.txt index 912ae427a..7324a0119 100644 --- a/Sources/RopeModule/CMakeLists.txt +++ b/Sources/RopeModule/CMakeLists.txt @@ -86,7 +86,7 @@ add_library(_RopeModule "Utilities/Optional Utilities.swift" ) target_link_libraries(_RopeModule PRIVATE - _CollectionsUtilities) + InternalCollectionsUtilities) set_target_properties(_RopeModule PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) diff --git a/Sources/RopeModule/Rope/Basics/Rope+Builder.swift b/Sources/RopeModule/Rope/Basics/Rope+Builder.swift index 5b1785b69..6e3517fc4 100644 --- a/Sources/RopeModule/Rope/Basics/Rope+Builder.swift +++ b/Sources/RopeModule/Rope/Basics/Rope+Builder.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension Rope { diff --git a/Sources/RopeModule/Rope/Basics/Rope+Debugging.swift b/Sources/RopeModule/Rope/Basics/Rope+Debugging.swift index dda00c994..3eb56ce81 100644 --- a/Sources/RopeModule/Rope/Basics/Rope+Debugging.swift +++ b/Sources/RopeModule/Rope/Basics/Rope+Debugging.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension Rope._UnmanagedLeaf: CustomStringConvertible { diff --git a/Sources/RopeModule/Rope/Basics/Rope+_Node.swift b/Sources/RopeModule/Rope/Basics/Rope+_Node.swift index fcea269fa..875250630 100644 --- a/Sources/RopeModule/Rope/Basics/Rope+_Node.swift +++ b/Sources/RopeModule/Rope/Basics/Rope+_Node.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if swift(<5.8) && !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities // for 5.8 polyfills +import InternalCollectionsUtilities // for 5.8 polyfills #endif extension Rope { diff --git a/Tests/OrderedCollectionsTests/OrderedSet/RandomAccessCollection+Extras.swift b/Tests/OrderedCollectionsTests/OrderedSet/RandomAccessCollection+Extras.swift index d4e327c2b..8abf1d599 100644 --- a/Tests/OrderedCollectionsTests/OrderedSet/RandomAccessCollection+Extras.swift +++ b/Tests/OrderedCollectionsTests/OrderedSet/RandomAccessCollection+Extras.swift @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// #if !COLLECTIONS_SINGLE_MODULE -import _CollectionsUtilities +import InternalCollectionsUtilities #endif extension RandomAccessCollection { diff --git a/Tests/_CollectionsTestSupport/Utilities/SortedCollectionAPIChecker.swift b/Tests/_CollectionsTestSupport/Utilities/SortedCollectionAPIChecker.swift index f13a3db6c..75fb75c02 100644 --- a/Tests/_CollectionsTestSupport/Utilities/SortedCollectionAPIChecker.swift +++ b/Tests/_CollectionsTestSupport/Utilities/SortedCollectionAPIChecker.swift @@ -12,7 +12,7 @@ #if COLLECTIONS_SINGLE_MODULE import Collections #else -import _CollectionsUtilities +import InternalCollectionsUtilities #endif /// This protocol simply lists Collection/Sequence extensions that ought to be diff --git a/Xcode/Collections.xcodeproj/project.pbxproj b/Xcode/Collections.xcodeproj/project.pbxproj index be6ef6487..2eaac6343 100644 --- a/Xcode/Collections.xcodeproj/project.pbxproj +++ b/Xcode/Collections.xcodeproj/project.pbxproj @@ -936,7 +936,7 @@ 7DE91E7029CA70F3004483EB /* Sources */ = { isa = PBXGroup; children = ( - 7DE91F2229CA70F3004483EB /* _CollectionsUtilities */, + 7DE91F2229CA70F3004483EB /* InternalCollectionsUtilities */, 7DE91F3929CA70F3004483EB /* BitCollections */, 7DE91F7929CA70F3004483EB /* Collections */, 7DE91EB629CA70F3004483EB /* DequeModule */, @@ -1249,7 +1249,7 @@ path = Utilities; sourceTree = ""; }; - 7DE91F2229CA70F3004483EB /* _CollectionsUtilities */ = { + 7DE91F2229CA70F3004483EB /* InternalCollectionsUtilities */ = { isa = PBXGroup; children = ( 7DEBDAD329CBEE5300ADC226 /* autogenerated */, @@ -1266,7 +1266,7 @@ 7DEBDAEC29CBEE5300ADC226 /* UnsafeMutableBufferPointer+Extras.swift.gyb */, 7DE91F2E29CA70F3004483EB /* CMakeLists.txt */, ); - path = _CollectionsUtilities; + path = InternalCollectionsUtilities; sourceTree = ""; }; 7DE91F3929CA70F3004483EB /* BitCollections */ = {