Cutback and Adjust tests

Author: johnno1962

stdlib/private/StdlibUnicodeUnittest/StdlibUnicodeUnittest.swift

@@ -142,11 +142,11 @@ public struct UTFTest {
   public let loc: SourceLoc
 
   public var utf32: [UInt32] {
-    return unicodeScalars.map({ s in UInt32(s) })
+    return unicodeScalars.map { UInt32($0) }
   }
 
   public var utf32RepairedTail: [UInt32] {
-    return unicodeScalarsRepairedTail.map({ s in UInt32(s) })
+    return unicodeScalarsRepairedTail.map { UInt32($0) }
   }
 
   public init(

stdlib/public/core/IntegerTypes.swift.gyb

@@ -1786,14 +1786,6 @@ ${operatorComment(x.operator, True)}
   }
 }
 
-extension ${Self} {
-  /// Construct with value `v.value`.
-  @inlinable @_alwaysEmitIntoClient
-  public init(unicode v: Unicode.Scalar) {
-    self = ${Self}(v.value)
-  }
-}
-
 
 extension ${Self}: Sendable { }
 

stdlib/public/core/UnicodeScalar.swift

@@ -380,51 +380,42 @@ extension UInt64 {
   }
 }
 
+extension FixedWidthInteger {
+  /// Construct with value `v.value`.
+  @inlinable @_alwaysEmitIntoClient
+  public init(unicode v: Unicode.Scalar) {
+    _precondition(v.value <= Self.max,
+        "Code point value does not fit into type")
+    self = Self(v.value)
+  }
+}
+
 /// Allows direct comparisons between UInt8 and double quoted literals.
 extension UInt8 {
-  /// Basic comparison operators
+  /// Basic equality operator
   @_transparent @_alwaysEmitIntoClient
   public static func == (i: Self, s: Unicode.Scalar) -> Bool {
     return i == UInt8(ascii: s)
   }
+  /// Basic inequality operator
   @_transparent @_alwaysEmitIntoClient
   public static func != (i: Self, s: Unicode.Scalar) -> Bool {
     return i != UInt8(ascii: s)
   }
-  @_transparent @_alwaysEmitIntoClient
-  public static func <= (i: Self, s: Unicode.Scalar) -> Bool {
-    return i <= UInt8(ascii: s)
-  }
-  @_transparent @_alwaysEmitIntoClient
-  public static func >= (i: Self, s: Unicode.Scalar) -> Bool {
-    return i >= UInt8(ascii: s)
-  }
-  @_transparent @_alwaysEmitIntoClient
-  public static func < (i: Self, s: Unicode.Scalar) -> Bool {
-    return i < UInt8(ascii: s)
-  }
-  @_transparent @_alwaysEmitIntoClient
-  public static func > (i: Self, s: Unicode.Scalar) -> Bool {
-    return i > UInt8(ascii: s)
-  }
   /// Used in switch statements
   @_transparent @_alwaysEmitIntoClient
   public static func ~= (s: Unicode.Scalar, i: Self) -> Bool {
     return i == UInt8(ascii: s)
   }
-  /// Useful now and then
-  @_transparent @_alwaysEmitIntoClient
-  public static func - (i: Self, s: Unicode.Scalar) -> Self {
-    return i - UInt8(ascii: s)
-  }
 }
 
 extension UInt8? {
-  /// Basic equality operators
+  /// Optional equality operator
   @_transparent @_alwaysEmitIntoClient
   public static func == (i: Self, s: Unicode.Scalar) -> Bool {
     return i == UInt8(ascii: s)
   }
+  /// Optional inequality operator
   @_transparent @_alwaysEmitIntoClient
   public static func != (i: Self, s: Unicode.Scalar) -> Bool {
     return i != UInt8(ascii: s)

test/Constraints/patterns.swift

@@ -631,9 +631,7 @@ func testExprPatternIsolation() {
   }
   for case 0 in nil {} // expected-error {{'nil' requires a contextual type}}
   for case 0 in [nil] {}
-  // expected-error@-1 {{type 'Any' cannot conform to 'Equatable'}}
-  // expected-note@-2 {{only concrete types such as structs, enums and classes can conform to protocols}}
-  // expected-note@-3 {{requirement from conditional conformance of 'Any?' to 'Equatable'}}
+  // expected-error@-1 {{expression pattern of type 'Int' cannot match values of type 'Any?'}}
 
   // Though we will try Double for an integer literal...
   let d: Double = 0
@@ -679,7 +677,7 @@ func testExprPatternIsolation() {
 
   // FIXME: Bad error (https://github.com/apple/swift/issues/64279)
   if case .e(nil, 0) = produceMultiPayload() {}
-  // expected-error@-1 {{expression pattern of type 'String' cannot match values of type 'Substring'}}
+  // expected-error@-1 {{expression pattern of type 'Unicode.Scalar' cannot match values of type 'UInt8'}}
   // expected-note@-2 {{overloads for '~=' exist with these partially matching parameter lists}}
 
   if case .e(5, nil) = produceMultiPayload() as MultiPayload<Int?> {}

test/Constraints/rdar105782480.swift

@@ -11,8 +11,8 @@ func foo(value: MyEnum) {
   takeClosure {
     switch value {
     case .second(let drag).invalid:
-      // expected-error@-1 {{value of type 'MyEnum' has no member 'invalid'}}
-      // expected-error@-2 {{'let' binding pattern cannot appear in an expression}}
+      // expected-error@-1 {{expression pattern of type 'Unicode.Scalar' cannot match values of type 'MyEnum'}}
+      // expected-error@-2 {{type 'Unicode.Scalar' has no member 'second'}}
       break
     }
   }

test/Prototypes/UnicodeDecoders.swift

@@ -650,11 +650,11 @@ public struct UTFTest {
   public let loc: SourceLoc
 
   public var utf32: [UInt32] {
-    return unicodeScalars.map(UInt32.init)
+    return unicodeScalars.map { UInt32($0) }
   }
 
   public var utf32RepairedTail: [UInt32] {
-    return unicodeScalarsRepairedTail.map(UInt32.init)
+    return unicodeScalarsRepairedTail.map { UInt32($0) }
   }
 
   public init(

test/stmt/typed_throws.swift

@@ -80,8 +80,8 @@ func testDoCatchMultiErrorType() {
   do {
     try doSomething()
     try doHomework()
-  } catch .failed { // expected-error{{type 'any Error' has no member 'failed'}}
-
+  } catch .failed { // expected-error{{expression pattern of type 'Unicode.Scalar' cannot match values of type 'any Error}}
+    // expected-error@-1{{type 'Unicode.Scalar' has no member 'failed'}}
   } catch {
     let _: Int = error // expected-error{{cannot convert value of type 'any Error' to specified type 'Int'}}
   }