---

yaml
---
r: 243165
b: refs/heads/swift-5.0-branch
c: 376753e
h: refs/heads/master
i:
  243163: d631611

Author: lorentey

[refs]

@@ -643,7 +643,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b7c074342459a645779f106c42bf4
 refs/heads/master-llvm-swift5-transition: 8ace18c8953afb3d7d94cf04cacc0b51a7e5f1e3
 "refs/heads/revert-12883-disable_modelio_test_ios": a77ae373b809a0d8cb460cf3d1585d618510d242
 refs/heads/revert-13597-master: cccee1df039d072215f9bddc2cbc1e32a8d5d5ee
-refs/heads/swift-5.0-branch: 1848b3730074228613c76c48fe91585042b41789
+refs/heads/swift-5.0-branch: 376753e3a0e2e7e2471a171c416d6ac4552a60af
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b32214f7e04339dfada623b6b76dbebfb41e4541
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-24-a: 1eb0be506c0744c7eff0550a10240286046e181d
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-25-a: f35a91502bad0065c83d8760407c23be7b899f48

branches/swift-5.0-branch/stdlib/public/core/Hasher.swift

@@ -20,7 +20,7 @@ import SwiftShims
 // rdar://problem/38549901
 @usableFromInline
 internal protocol _HasherCore {
-  init(seed: (UInt64, UInt64))
+  init(seed: Hasher._Seed)
   mutating func compress(_ value: UInt64)
   mutating func finalize(tailAndByteCount: UInt64) -> UInt64
 
@@ -33,7 +33,7 @@ internal protocol _HasherCore {
   /// This comes handy when type's _hash(into:) implementation needs to perform
   /// one-shot hashing for some of its components. (E.g., for commutative
   /// hashing.)
-  func _generateSeed() -> (UInt64, UInt64)
+  func _generateSeed() -> Hasher._Seed
 }
 
 @inline(__always)
@@ -160,7 +160,7 @@ internal struct _BufferingHasher<Core: _HasherCore> {
   private var _core: Core
 
   @inline(__always)
-  internal init(seed: (UInt64, UInt64)) {
+  internal init(seed: Hasher._Seed) {
     self._buffer = _HasherTailBuffer()
     self._core = Core(seed: seed)
   }
@@ -252,7 +252,7 @@ internal struct _BufferingHasher<Core: _HasherCore> {
   // Generate a seed value from the current state of this hasher.
   // FIXME(hasher): Remove
   @inline(__always)
-  internal func _generateSeed() -> (UInt64, UInt64) {
+  internal func _generateSeed() -> Hasher._Seed {
     return _core._generateSeed()
   }
 
@@ -296,6 +296,9 @@ public struct Hasher {
   @usableFromInline
   internal typealias Core = _BufferingHasher<RawCore>
 
+  @usableFromInline
+  internal typealias _Seed = (UInt64, UInt64)
+
   internal var _core: Core
 
   /// Creates a new hasher.
@@ -310,7 +313,7 @@ public struct Hasher {
   /// Initialize a new hasher using the specified seed value.
   @usableFromInline
   @_effects(releasenone)
-  internal init(_seed seed: (UInt64, UInt64)) {
+  internal init(_seed seed: _Seed) {
     self._core = Core(seed: seed)
   }
 
@@ -331,7 +334,7 @@ public struct Hasher {
   /// The 128-bit hash seed used to initialize the hasher state. Initialized
   /// once during process startup.
   @inlinable
-  internal static var _seed: (UInt64, UInt64) {
+  internal static var _seed: _Seed {
     @inline(__always)
     get {
       // The seed itself is defined in C++ code so that it is initialized during
@@ -428,13 +431,13 @@ public struct Hasher {
   // FIXME(hasher): Remove
   @_effects(readnone)
   @usableFromInline
-  internal func _generateSeed() -> (UInt64, UInt64) {
+  internal func _generateSeed() -> Hasher._Seed {
     return _core._generateSeed()
   }
 
   @_effects(readnone)
   @usableFromInline
-  internal static func _hash(seed: (UInt64, UInt64), _ value: UInt64) -> Int {
+  internal static func _hash(seed: _Seed, _ value: UInt64) -> Int {
     var core = RawCore(seed: seed)
     core.compress(value)
     let tbc = _HasherTailBuffer(tail: 0, byteCount: 8)
@@ -443,7 +446,7 @@ public struct Hasher {
 
   @_effects(readnone)
   @usableFromInline
-  internal static func _hash(seed: (UInt64, UInt64), _ value: UInt) -> Int {
+  internal static func _hash(seed: _Seed, _ value: UInt) -> Int {
     var core = RawCore(seed: seed)
 #if arch(i386) || arch(arm)
     _sanityCheck(UInt.bitWidth < UInt64.bitWidth)
@@ -461,7 +464,7 @@ public struct Hasher {
   @_effects(readnone)
   @usableFromInline
   internal static func _hash(
-    seed: (UInt64, UInt64),
+    seed: _Seed,
     bytes value: UInt64,
     count: Int) -> Int {
     _sanityCheck(count >= 0 && count < 8)
@@ -473,7 +476,7 @@ public struct Hasher {
   @_effects(readnone)
   @usableFromInline
   internal static func _hash(
-    seed: (UInt64, UInt64),
+    seed: _Seed,
     bytes: UnsafeRawBufferPointer) -> Int {
     var core = Core(seed: seed)
     core.combine(bytes: bytes)