Merge branch 'develop' into develop

Author: AndreyMaksimkin

Carthage/Checkouts/CryptoSwift/CryptoSwift.xcworkspace/contents.xcworkspacedata renamed to .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1 @@
+Subproject commit 4b9283599f7dc904dda099e820226cc1639e6b82

73a65a1766e605eaeb5d699fcaa8da02

@@ -1,5 +1,5 @@
-github "attaswift/BigInt" ~> 5.0
+github "attaswift/BigInt" ~> 5.2.1
 github "attaswift/SipHash" ~> 1.2.2
-github "daltoniam/Starscream" ~> 3.1.0
-github "krzyzanowskim/CryptoSwift" ~> 1.0.0
-github "mxcl/PromiseKit" ~> 6.8.4
+github "daltoniam/Starscream" ~> 4.0.4
+github "krzyzanowskim/CryptoSwift" ~> 1.4.0
+github "mxcl/PromiseKit" ~> 6.15.3

Cartfile

@@ -1,5 +1,5 @@
-github "attaswift/BigInt" "v5.2.0"
+github "attaswift/BigInt" "v5.2.1"
 github "attaswift/SipHash" "v1.2.2"
-github "daltoniam/Starscream" "3.1.1"
-github "krzyzanowskim/CryptoSwift" "1.3.2"
-github "mxcl/PromiseKit" "6.13.3"
+github "daltoniam/Starscream" "4.0.4"
+github "krzyzanowskim/CryptoSwift" "1.4.1"
+github "mxcl/PromiseKit" "6.15.3"

Cartfile.resolved

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |spec|
     spec.name         = 'BigInt'
-    spec.version      = '5.2.0'
+    spec.version      = '5.2.1'
     spec.ios.deployment_target = "8.0"
     spec.osx.deployment_target = "10.9"
     spec.tvos.deployment_target = "9.0"

Carthage/Checkouts/BigInt/BigInt.podspec

@@ -1,3 +1,9 @@
+# 5.2.1 (2020-11-15)
+
+This release contains the following changes:
+
+- Added a temporary fix for [SR-13491](https://bugs.swift.org/browse/SR-13491)
+
 # 5.2.0 (2020-08-24)
 
 This release contains the following changes:

Carthage/Checkouts/BigInt/CHANGELOG.md

@@ -105,7 +105,7 @@ The last version with support for Swift 2 was BigInt 1.3.0.)
 | 3.x           | 2.1.0              |
 | 4.0           | 3.1.0              |
 | 4.2           | 4.0.0              |
-| 5.0           | 5.0.0              |
+| 5.x           | 5.2.1              |
 
 BigInt deploys to macOS 10.10, iOS 9, watchOS 2 and tvOS 9.
 It has been tested on the latest OS releases only---however, as the module uses very few platform-provided APIs,
@@ -121,19 +121,19 @@ Setup instructions:
   Add this to the dependency section of your `Package.swift` manifest:
 
     ```Swift
-    .package(url: "https://github.com/attaswift/BigInt.git", from: "5.0.0")
+    .package(url: "https://github.com/attaswift/BigInt.git", from: "5.2.1")
     ```
 
 - **CocoaPods:** Put this in your `Podfile`:
 
     ```Ruby
-    pod 'BigInt', '~> 5.0'
+    pod 'BigInt', '~> 5.2'
     ```
 
 - **Carthage:** Put this in your `Cartfile`:
 
     ```
-    github "attaswift/BigInt" ~> 5.0
+    github "attaswift/BigInt" ~> 5.2
     ```
 
 ## <a name="notes">Implementation notes</a>

Carthage/Checkouts/BigInt/Demo.playground/Contents.o

@@ -8,7 +8,8 @@
 
 //MARK: Full-width multiplication and division
 
-extension FixedWidthInteger where Magnitude == Self {
+// TODO: Return to `where Magnitude == Self` when SR-13491 is resolved
+extension FixedWidthInteger {
     private var halfShift: Self {
         return Self(Self.bitWidth / 2)
 
@@ -91,13 +92,13 @@ extension FixedWidthInteger where Magnitude == Self {
         let w = Self(Self.bitWidth) - z
         let vn = self << z
 
-        let un32 = (z == 0 ? dividend.high : (dividend.high &<< z) | (dividend.low &>> w)) // No bits are lost
+        let un32 = (z == 0 ? dividend.high : (dividend.high &<< z) | ((dividend.low as! Self) &>> w)) // No bits are lost
         let un10 = dividend.low &<< z
         let (un1, un0) = un10.split
 
         // Divide `(un32,un10)` by `vn`, splitting the full 4/2 division into two 3/2 ones.
-        let (q1, un21) = quotientAndRemainder(dividing: (un32, un1), by: vn)
-        let (q0, rn) = quotientAndRemainder(dividing: (un21, un0), by: vn)
+        let (q1, un21) = quotientAndRemainder(dividing: (un32, (un1 as! Self)), by: vn)
+        let (q0, rn) = quotientAndRemainder(dividing: (un21, (un0 as! Self)), by: vn)
 
         // Undo normalization of the remainder and combine the two halves of the quotient.
         let mod = rn >> z
@@ -120,7 +121,7 @@ extension FixedWidthInteger where Magnitude == Self {
             r = s
         }
         else {
-            (q, r) = y.0.fastDividingFullWidth((x.0, x.1))
+            (q, r) = y.0.fastDividingFullWidth((x.0, (x.1 as! Magnitude)))
         }
         // Now refine q by considering x.2 and y.1.
         // Note that since y is normalized, q * y - x is between 0 and 2.
@@ -130,7 +131,7 @@ extension FixedWidthInteger where Magnitude == Self {
         let (r1, ro) = r.addingReportingOverflow(y.0)
         if ro { return q - 1 }
 
-        let (pl1, so) = pl.subtractingReportingOverflow(y.1)
+        let (pl1, so) = pl.subtractingReportingOverflow((y.1 as! Magnitude))
         let ph1 = (so ? ph - 1 : ph)
 
         if ph1 < r1 || (ph1 == r1 && pl1 <= x.2) { return q - 1 }

Carthage/Checkouts/BigInt/README.md

@@ -9,11 +9,12 @@
 import XCTest
 @testable import BigInt
 
-struct TestDivision<Word: FixedWidthInteger> where Word.Magnitude == Word {
+// TODO: Return to `where Word.Magnitude == Word` when SR-13491 is resolved
+struct TestDivision<Word: FixedWidthInteger> {
     static func testDivision(_ u: (high: Word, low: Word.Magnitude), _ v: Word) {
         let (div, mod) = v.fastDividingFullWidth(u)
         var (ph, pl) = div.multipliedFullWidth(by: v)
-        let (s, o) = pl.addingReportingOverflow(mod)
+        let (s, o) = pl.addingReportingOverflow((mod as! Word.Magnitude))
         pl = s
         if o { ph += Word(1) }