Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -209,7 +209,7 @@ let targets: [CustomTarget] = [
.target(
kind: .exported,
name: "BitCollections",
dependencies: ["_CollectionsUtilities"],
dependencies: ["InternalCollectionsUtilities"],
exclude: ["CMakeLists.txt"]),
.target(
kind: .test,
Expand All @@ -221,7 +221,7 @@ let targets: [CustomTarget] = [
.target(
kind: .exported,
name: "DequeModule",
dependencies: ["_CollectionsUtilities"],
dependencies: ["InternalCollectionsUtilities"],
exclude: ["CMakeLists.txt"]),
.target(
kind: .test,
Expand All @@ -231,7 +231,7 @@ let targets: [CustomTarget] = [
.target(
kind: .exported,
name: "HashTreeCollections",
dependencies: ["_CollectionsUtilities"],
dependencies: ["InternalCollectionsUtilities"],
exclude: ["CMakeLists.txt"]),
.target(
kind: .test,
Expand All @@ -241,7 +241,7 @@ let targets: [CustomTarget] = [
.target(
kind: .exported,
name: "HeapModule",
dependencies: ["_CollectionsUtilities"],
dependencies: ["InternalCollectionsUtilities"],
exclude: ["CMakeLists.txt"]),
.target(
kind: .test,
Expand All @@ -251,7 +251,7 @@ let targets: [CustomTarget] = [
.target(
kind: .exported,
name: "OrderedCollections",
dependencies: ["_CollectionsUtilities"],
dependencies: ["InternalCollectionsUtilities"],
exclude: ["CMakeLists.txt"]),
.target(
kind: .test,
Expand All @@ -261,7 +261,7 @@ let targets: [CustomTarget] = [
.target(
kind: .exported,
name: "_RopeModule",
dependencies: ["_CollectionsUtilities"],
dependencies: ["InternalCollectionsUtilities"],
directory: "RopeModule",
exclude: ["CMakeLists.txt"]),
.target(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

internal struct _ChunkedBitsForwardIterator {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitArray/BitArray+Copy.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitArray {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitArray {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitArray: RangeReplaceableCollection {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitArray {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitArray/BitArray.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

/// An ordered, random-access collection of `Bool` values, implemented as an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet: CustomStringConvertible {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitSet/BitSet+Extras.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet: _UniqueCollection {}
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitSet/BitSet+Initializers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitSet/BitSet+Invariants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

// FIXME: These are non-standard extensions generalizing ==.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet: _SortedCollection {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitSet/BitSet.Counted.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitSet/BitSet.Index.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitSet/BitSet._UnsafeHandle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension BitSet {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/BitSet/BitSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

/// A sorted collection of small nonnegative integers, implemented as an
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/Shared/UInt+Tricks.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension UInt {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitCollections/Shared/_Word.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

@usableFromInline
Expand Down
2 changes: 1 addition & 1 deletion Sources/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ add_subdirectory(HashTreeCollections)
add_subdirectory(HeapModule)
add_subdirectory(OrderedCollections)
add_subdirectory(RopeModule)
add_subdirectory(_CollectionsUtilities)
add_subdirectory(InternalCollectionsUtilities)
2 changes: 1 addition & 1 deletion Sources/DequeModule/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion Sources/DequeModule/Deque+Collection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension Deque: Sequence {
Expand Down
2 changes: 1 addition & 1 deletion Sources/DequeModule/Deque+Descriptions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//===----------------------------------------------------------------------===//

#if !COLLECTIONS_SINGLE_MODULE
import _CollectionsUtilities
import InternalCollectionsUtilities
#endif

extension Deque: CustomStringConvertible {
Expand Down
Loading