Merge pull request swiftlang#8884 from apple/clean-up-warnings

Author: swift-ci

stdlib/public/core/CompilerProtocols.swift

@@ -61,7 +61,7 @@
 /// `OptionSet` protocol. Whether using an option set or creating your own,
 /// you use the raw value of an option set instance to store the instance's
 /// bitfield. The raw value must therefore be of a type that conforms to the
-/// `BitwiseOperations` protocol, such as `UInt8` or `Int`. For example, the
+/// `FixedWidthInteger` protocol, such as `UInt8` or `Int`. For example, the
 /// `Direction` type defines an option set for the four directions you can
 /// move in a game.
 ///
@@ -99,7 +99,7 @@
 ///     print(allowedMoves.rawValue & Directions.right.rawValue)
 ///     // Prints "0"
 ///
-/// - SeeAlso: `OptionSet`, `BitwiseOperations`
+/// - SeeAlso: `OptionSet`, `FixedWidthInteger`
 public protocol RawRepresentable {
   /// The raw type that can be used to represent all values of the conforming
   /// type.

stdlib/public/core/FixedPoint.swift.gyb

@@ -56,7 +56,7 @@ public protocol _Integer
     CustomStringConvertible,
     Hashable,
     IntegerArithmetic,
-    BitwiseOperations,
+    _BitwiseOperations,
     _Incrementable
 {
 }
@@ -611,7 +611,7 @@ public func ${op}(lhs: ${Self}, rhs: ${Self}) -> ${Self} {
 // Bitwise negate
 /// Returns the inverse of the bits set in the argument.
 ///
-/// - SeeAlso: `BitwiseOperations`
+/// - SeeAlso: `FixedWidthInteger`
 @_transparent
 public prefix func ~ (rhs: ${Self}) -> ${Self} {
   let mask = ${Self}.subtractWithOverflow(0, 1).0
@@ -657,7 +657,7 @@ public func ${op} (lhs: ${Self}, rhs: ${Self}) -> ${Self} {
 % ):
 /// Returns the ${comment} the two arguments.
 ///
-/// - SeeAlso: `BitwiseOperations`
+/// - SeeAlso: `FixedWidthInteger`
 @_transparent
 public func ${op} (lhs: ${Self}, rhs: ${Self}) -> ${Self} {
   return ${Self}(Builtin.${name}_${BuiltinName}(lhs._value, rhs._value))
@@ -666,15 +666,15 @@ public func ${op} (lhs: ${Self}, rhs: ${Self}) -> ${Self} {
 /// Calculates the ${comment} the two arguments
 /// and stores the result in the first argument.
 ///
-/// - SeeAlso: `BitwiseOperations`
+/// - SeeAlso: `FixedWidthInteger`
 @_transparent
 public func ${op}=(lhs: inout ${Self}, rhs: ${Self}) {
   lhs = lhs ${op} rhs
 }
 % end
 
 // Bitwise operations
-extension ${Self} : BitwiseOperations {
+extension ${Self} : FixedWidthInteger {
   /// The empty bitset of type `${Self}`.
   @_transparent
   public static var allZeros: ${Self} { return 0 }

stdlib/public/core/FloatingPoint.swift.gyb

@@ -171,7 +171,7 @@ public protocol FloatingPoint: SignedNumeric, Strideable, Hashable {
 
   // For the minimumMagnitude and maximumMagnitude methods
   // FIXME(integers): document me properly
-  associatedtype Magnitude : Comparable = Self
+  associatedtype Magnitude = Self
 
   /// A type that represents any written exponent.
   associatedtype Exponent: SignedInteger

stdlib/public/core/Integers.swift.gyb

@@ -1339,7 +1339,7 @@ extension Numeric {
 ///     }
 ///     // Prints "23 is greater than -23."
 public protocol BinaryInteger :
-  Comparable, Hashable, Numeric, CustomStringConvertible, Strideable {
+  Hashable, Numeric, CustomStringConvertible, Strideable {
 
   /// A Boolean value indicating whether this type is a signed integer type.
   ///
@@ -2009,7 +2009,7 @@ public enum ArithmeticOverflow {
 /// customization points for arithmetic operations. When you provide just those
 /// methods, the standard library provides default implementations for all
 /// other arithmetic methods and operators.
-public protocol FixedWidthInteger : BinaryInteger, BitwiseOperations {
+public protocol FixedWidthInteger : BinaryInteger, _BitwiseOperations {
   /// The number of bits used for the underlying binary representation of
   /// values of this type.
   ///

stdlib/public/core/OptionSet.swift

@@ -21,7 +21,7 @@
 ///
 /// When creating an option set, include a `rawValue` property in your type
 /// declaration. The `rawValue` property must be of a type that conforms to
-/// the `BitwiseOperations` protocol, such as `Int` or `UInt8`. Next, create
+/// the `FixedWidthInteger` protocol, such as `Int` or `UInt8`. Next, create
 /// unique options as static properties of your custom type using unique
 /// powers of two (1, 2, 4, 8, 16, and so forth) for each individual
 /// property's raw value so that each property can be represented by a single
@@ -83,7 +83,7 @@
 ///     }
 ///     // Prints "You've earned free priority shipping!"
 ///
-/// - SeeAlso: `BitwiseOperations`, `SetAlgebra`
+/// - SeeAlso: `FixedWidthInteger`, `SetAlgebra`
 public protocol OptionSet : SetAlgebra, RawRepresentable {
   // We can't constrain the associated Element type to be the same as
   // Self, but we can do almost as well with a default and a
@@ -307,7 +307,7 @@ extension OptionSet where Element == Self {
 }
 
 /// `OptionSet` requirements for which default implementations are
-/// supplied when `RawValue` conforms to `BitwiseOperations`,
+/// supplied when `RawValue` conforms to `FixedWidthInteger`,
 /// which is the usual case.  Each distinct bit of an option set's
 /// `.rawValue` corresponds to a disjoint value of the `OptionSet`.
 ///

stdlib/public/core/Policy.swift

@@ -390,7 +390,9 @@ public typealias AnyClass = AnyObject.Type
 ///
 /// - SeeAlso: `OptionSet`
 @available(swift, deprecated: 3.1, obsoleted: 4.0, message: "Use FixedWidthInteger protocol instead")
-public protocol BitwiseOperations {
+typealias BitwiseOperations = _BitwiseOperations
+
+public protocol _BitwiseOperations {
   /// Returns the intersection of bits set in the two arguments.
   ///
   /// The bitwise AND operator (`&`) returns a value that has each bit set to
@@ -495,7 +497,7 @@ public protocol BitwiseOperations {
 /// - Parameters:
 ///   - lhs: A value to update with the union of bits set in the two arguments.
 ///   - rhs: Another value.
-public func |= <T : BitwiseOperations>(lhs: inout T, rhs: T) {
+public func |= <T : _BitwiseOperations>(lhs: inout T, rhs: T) {
   lhs = lhs | rhs
 }
 
@@ -506,7 +508,7 @@ public func |= <T : BitwiseOperations>(lhs: inout T, rhs: T) {
 ///   - lhs: A value to update with the intersections of bits set in the two
 ///     arguments.
 ///   - rhs: Another value.
-public func &= <T : BitwiseOperations>(lhs: inout T, rhs: T) {
+public func &= <T : _BitwiseOperations>(lhs: inout T, rhs: T) {
   lhs = lhs & rhs
 }
 
@@ -517,7 +519,7 @@ public func &= <T : BitwiseOperations>(lhs: inout T, rhs: T) {
 ///   - lhs: A value to update with the bits that are set in exactly one of the
 ///     two arguments.
 ///   - rhs: Another value.
-public func ^= <T : BitwiseOperations>(lhs: inout T, rhs: T) {
+public func ^= <T : _BitwiseOperations>(lhs: inout T, rhs: T) {
   lhs = lhs ^ rhs
 }
 

test/SourceKit/DocSupport/doc_clang_module.swift.response

@@ -6149,7 +6149,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
         key.description: "Self.RawValue : FixedWidthInteger"
       }
     ],
-    key.doc.full_as_xml: "<Other><Name></Name><Declaration>extension FooRuncingOptions where Self.RawValue : FixedWidthInteger</Declaration><CommentParts><Abstract><Para><codeVoice>OptionSet</codeVoice> requirements for which default implementations are supplied when <codeVoice>RawValue</codeVoice> conforms to <codeVoice>BitwiseOperations</codeVoice>, which is the usual case.  Each distinct bit of an option set’s <codeVoice>.rawValue</codeVoice> corresponds to a disjoint value of the <codeVoice>OptionSet</codeVoice>.</Para></Abstract><Discussion><Note><Para>A type conforming to <codeVoice>OptionSet</codeVoice> can implement any of these initializers or methods, and those implementations will be used in lieu of these defaults.</Para></Note><List-Bullet><Item><Para><codeVoice>union</codeVoice> is implemented as a bitwise “or” (<codeVoice>|</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item><Item><Para><codeVoice>intersection</codeVoice> is implemented as a bitwise “and” (<codeVoice>&amp;</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item><Item><Para><codeVoice>symmetricDifference</codeVoice> is implemented as a bitwise “exclusive or” (<codeVoice>^</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item></List-Bullet></Discussion></CommentParts></Other>",
+    key.doc.full_as_xml: "<Other><Name></Name><Declaration>extension FooRuncingOptions where Self.RawValue : FixedWidthInteger</Declaration><CommentParts><Abstract><Para><codeVoice>OptionSet</codeVoice> requirements for which default implementations are supplied when <codeVoice>RawValue</codeVoice> conforms to <codeVoice>FixedWidthInteger</codeVoice>, which is the usual case.  Each distinct bit of an option set’s <codeVoice>.rawValue</codeVoice> corresponds to a disjoint value of the <codeVoice>OptionSet</codeVoice>.</Para></Abstract><Discussion><Note><Para>A type conforming to <codeVoice>OptionSet</codeVoice> can implement any of these initializers or methods, and those implementations will be used in lieu of these defaults.</Para></Note><List-Bullet><Item><Para><codeVoice>union</codeVoice> is implemented as a bitwise “or” (<codeVoice>|</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item><Item><Para><codeVoice>intersection</codeVoice> is implemented as a bitwise “and” (<codeVoice>&amp;</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item><Item><Para><codeVoice>symmetricDifference</codeVoice> is implemented as a bitwise “exclusive or” (<codeVoice>^</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item></List-Bullet></Discussion></CommentParts></Other>",
     key.offset: 2502,
     key.length: 247,
     key.extends: {