Merge pull request #4112 from apple/remove-integers-from-3.0-branch

Remove integers from 3.0 branch

Author: tkremenek

benchmark/single-source/MonteCarloE.swift

@@ -33,6 +33,6 @@ public func run_MonteCarloE(scale: Int) {
                "Incorrect results in MonteCarloE: no empty intervals.")
   let e_estimate = Double(N)/Double(numEmptyIntervals)
   let e = 2.71828
-  CheckResults(abs(e_estimate - e) < 0.1,
+  CheckResults(Double.abs(e_estimate - e) < 0.1,
                "Incorrect results in MonteCarloE: e_estimate == \(e_estimate)")
 }

benchmark/single-source/MonteCarloPi.swift

@@ -25,6 +25,6 @@ public func run_MonteCarloPi(scale: Int) {
   }
   let pi_estimate: Double = Double(pointsInside)*4.0/Double(N)
   let pi = 3.1415
-  CheckResults(abs(pi_estimate - pi) < 0.1,
+  CheckResults(Double.abs(pi_estimate - pi) < 0.1,
                "Incorrect results in MonteCarloPi: pi_estimate == \(pi_estimate)")
 }

stdlib/public/SDK/CoreGraphics/CGFloat.swift.gyb

@@ -174,8 +174,8 @@ public struct CGFloat {
     return CGFloat(native.nextUp)
   }
 
-  public var magnitude: CGFloat {
-    return CGFloat(abs(native))
+  public static func abs(_ x: CGFloat) -> CGFloat {
+    return CGFloat(NativeType.abs(x.native))
   }
 
   public mutating func negate() {
@@ -296,11 +296,6 @@ extension CGFloat {
   public static var max: CGFloat {
     fatalError("unavailable")
   }
-
-  @available(*, unavailable, message: "Please use the `abs(_:)` free function")
-  public static func abs(_ x: CGFloat) -> CGFloat {
-    fatalError("unavailable")
-  }
 }
 
 @available(*, unavailable, renamed: "CGFloat.leastNormalMagnitude")

stdlib/public/core/CMakeLists.txt

@@ -70,7 +70,6 @@ set(SWIFTLIB_ESSENTIAL
   InputStream.swift
   IntegerArithmetic.swift.gyb
   IntegerParsing.swift.gyb
-  Integers.swift.gyb
   Join.swift
   LazyCollection.swift.gyb
   LazySequence.swift

stdlib/public/core/FloatingPoint.swift.gyb

@@ -167,8 +167,8 @@ word_bits = int(CMAKE_SIZEOF_VOID_P) * 8
 ///     print("Average: \(average)°F in \(validTemps.count) " +
 ///           "out of \(tempsFahrenheit.count) observations.")
 ///     // Prints "Average: 74.84°F in 5 out of 7 observations."
-public protocol FloatingPoint: Comparable, Arithmetic,
-  SignedNumber, Strideable {
+public protocol FloatingPoint: Comparable, ExpressibleByIntegerLiteral,
+  SignedNumber, AbsoluteValuable, Strideable {
 
   /// A type that can represent any written exponent.
   associatedtype Exponent: SignedInteger
@@ -1954,11 +1954,5 @@ extension BinaryFloatingPoint {
   */
 }
 
-/// Returns the absolute value of `x`.
-@_transparent
-public func abs<T : FloatingPoint>(_ x: T) -> T where T.Magnitude == T {
-  return x.magnitude
-}
-
 @available(*, unavailable, renamed: "FloatingPoint")
 public typealias FloatingPointType = FloatingPoint

stdlib/public/core/FloatingPointTypes.swift.gyb

@@ -808,7 +808,7 @@ extension ${Self} : Hashable {
   }
 }
 
-extension ${Self} : Arithmetic {
+extension ${Self} : AbsoluteValuable {
   /// The magnitude of this value.
   ///
   /// For any value `x`, `x.magnitude.sign` is `.plus`. If `x` is not NaN,
@@ -832,8 +832,8 @@ extension ${Self} : Arithmetic {
   ///
   /// - SeeAlso: `abs(_:)`
   @_transparent
-  public var magnitude: ${Self} {
-    return ${Self}(_bits: Builtin.int_fabs_FPIEEE${bits}(_value))
+  public static func abs(_ x: ${Self}) -> ${Self} {
+    return ${Self}(_bits: Builtin.int_fabs_FPIEEE${bits}(x._value))
   }
 }
 
@@ -1126,13 +1126,4 @@ extension ${Self} {
 %     end
 %   end
 }
-
-
-extension ${Self} {
-  @available(*, unavailable, message: "Please use the `abs(_:)` free function")
-  public static func abs(_ x: ${Self}) -> ${Self} {
-    fatalError("unavailable")
-  }
-}
-
 % end # for (bits, signed) in allInts()

stdlib/public/core/GroupInfo.json

@@ -102,7 +102,6 @@
     "BuiltinMath.swift",
     {
     "Integers": [
-      "Integers.swift",
       "IntegerArithmetic.swift",
       "FixedPoint.swift",
       "IntegerParsing.swift"],