Oops, fix RawCollider conflict

Author: lorentey

Tests/HashTreeCollectionsTests/Colliders.swift

@@ -0,0 +1,54 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift Collections open source project
+//
+// Copyright (c) 2022 - 2026 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+//
+// SPDX-License-Identifier: Apache-2.0 WITH Swift-exception
+//
+//===----------------------------------------------------------------------===//
+
+/// A type with manually controlled hash values, for easy testing of collision
+/// scenarios.
+package struct Collider:
+  Hashable, CustomStringConvertible, CustomDebugStringConvertible
+{
+  package var identity: Int
+  package var hash: Hash
+
+  package init(_ identity: Int, _ hash: Hash) {
+    self.identity = identity
+    self.hash = hash
+  }
+
+  package init(_ identity: Int) {
+    self.identity = identity
+    self.hash = Hash(identity)
+  }
+
+  package init(_ identity: String) {
+    self.hash = Hash(identity)!
+    self.identity = hash.value
+  }
+
+  package static func ==(left: Self, right: Self) -> Bool {
+    guard left.identity == right.identity else { return false }
+    precondition(left.hash == right.hash)
+    return true
+  }
+
+  package func hash(into hasher: inout Hasher) {
+    hasher.combine(hash.value)
+  }
+
+  package var description: String {
+    "\(identity)(#\(hash))"
+  }
+
+  package var debugDescription: String {
+    description
+  }
+}

Tests/_CollectionsTestSupport/Utilities/Collider.swift

@@ -12,39 +12,39 @@
 //===----------------------------------------------------------------------===//
 
 /// An abstract representation of a hash value.
-struct Hash {
-  var value: Int
+package struct Hash {
+  package var value: Int
 
-  init(_ value: Int) {
+  package init(_ value: Int) {
     self.value = value
   }
 
-  init(_ value: UInt) {
+  package init(_ value: UInt) {
     self.value = Int(bitPattern: value)
   }
 }
 
 
 extension Hash {
-  static var bucketBitWidth: Int { 5 }
-  static var bucketCount: Int { 1 << bucketBitWidth }
-  static var bitWidth: Int { UInt.bitWidth }
+  package static var bucketBitWidth: Int { 5 }
+  package static var bucketCount: Int { 1 << bucketBitWidth }
+  package static var bitWidth: Int { UInt.bitWidth }
 }
 
 extension Hash: Equatable {
-  static func ==(left: Self, right: Self) -> Bool {
+  package static func ==(left: Self, right: Self) -> Bool {
     left.value == right.value
   }
 }
 
 extension Hash: Hashable {
-  func hash(into hasher: inout Hasher) {
+  package func hash(into hasher: inout Hasher) {
     hasher.combine(value)
   }
 }
 
 extension Hash: CustomStringConvertible {
-  var description: String {
+  package var description: String {
     // Print hash values in radix 32 & reversed, so that the path in the hash
     // tree is readily visible.
     let p = String(
@@ -62,21 +62,21 @@ extension Hash: CustomStringConvertible {
 }
 
 extension Hash: LosslessStringConvertible {
-  init?(_ description: String) {
+  package init?(_ description: String) {
     let s = String(description.reversed())
     guard let hash = UInt(s, radix: 32) else { return nil }
     self.init(Int(bitPattern: hash))
   }
 }
 
 extension Hash: ExpressibleByIntegerLiteral {
-  init(integerLiteral value: UInt) {
+  package init(integerLiteral value: UInt) {
     self.init(value)
   }
 }
 
 extension Hash: ExpressibleByStringLiteral {
-  init(stringLiteral value: String) {
+  package init(stringLiteral value: String) {
     self.init(value)!
   }
 }

Tests/HashTreeCollectionsTests/Hash.swift …lectionsTestSupport/Utilities/Hash.swiftTests/HashTreeCollectionsTests/Hash.swift renamed to Tests/_CollectionsTestSupport/Utilities/Hash.swift Tests/HashTreeCollectionsTests/Hash.swift renamed to Tests/_CollectionsTestSupport/Utilities/Hash.swift

@@ -17,21 +17,31 @@ package struct RawCollider:
   Hashable, CustomStringConvertible
 {
   package var identity: Int
-  package var rawHashValue: Int
+  package var hash: Hash
+
+  package init(_ identity: Int, _ hash: Hash) {
+    self.identity = identity
+    self.hash = hash
+  }
 
   package init(_ identity: Int, _ rawHashValue: Int) {
     self.identity = identity
-    self.rawHashValue = rawHashValue
+    self.hash = Hash(rawHashValue)
   }
 
   package init(_ identity: Int) {
     self.identity = identity
-    self.rawHashValue = identity
+    self.hash = Hash(identity)
+  }
+
+  package init(_ identity: String) {
+    self.hash = Hash(identity)!
+    self.identity = hash.value
   }
 
   package static func ==(left: Self, right: Self) -> Bool {
     guard left.identity == right.identity else { return false }
-    precondition(left.rawHashValue == right.rawHashValue)
+    precondition(left.hash == right.hash)
     return true
   }
 
@@ -44,10 +54,10 @@ package struct RawCollider:
   }
 
   package func _rawHashValue(seed: Int) -> Int {
-    rawHashValue
+    hash.value
   }
 
   package var description: String {
-    "\(identity)#\(rawHashValue)"
+    "\(identity)#\(hash)"
   }
 }