Merge pull request swiftlang#25 from airspeedswift/utf8-diag-tests

[utf8] Fix some simple test failures

Author: airspeedswift

stdlib/public/SDK/Foundation/CMakeLists.txt

@@ -13,7 +13,6 @@ add_swift_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SD
   DateComponents.swift
   DateInterval.swift
   Decimal.swift
-  ExtraStringAPIs.swift
   FileManager.swift
   Foundation.swift
   IndexPath.swift

stdlib/public/SDK/Foundation/ExtraStringAPIs.swift

@@ -200,23 +200,6 @@ extension String {
   public init(_ utf16: UTF16View) {
     self.init(utf16._guts)
   }
-
-  #if _runtime(_ObjC)
-  // These may become less important once <rdar://problem/19255291> is addressed.
-  @available(
-    *, unavailable,
-    message: "Indexing a String's UTF16View requires a String.UTF16View.Index, which can be constructed from Int when Foundation is imported")
-  public subscript(i: Int) -> UTF16.CodeUnit {
-    Builtin.unreachable()
-  }
-
-  @available(
-    *, unavailable,
-    message: "Slicing a String's UTF16View requires a Range<String.UTF16View.Index>, String.UTF16View.Index can be constructed from Int when Foundation is imported")
-  public subscript(bounds: Range<Int>) -> UTF16View {
-    Builtin.unreachable()
-  }
-#endif
 }
 
 // Index conversions

stdlib/public/core/StringUTF16View.swift

@@ -239,24 +239,6 @@ extension String {
       return UTF16._replacementCodeUnit
     }
 
-#if _runtime(_ObjC)
-    // These may become less important once <rdar://problem/19255291> is addressed.
-
-    @available(
-      *, unavailable,
-      message: "Indexing a String's UTF16View requires a String.UTF16View.Index, which can be constructed from Int when Foundation is imported")
-    public subscript(i: Int) -> UTF16.CodeUnit {
-      Builtin.unreachable()
-    }
-
-    @available(
-      *, unavailable,
-      message: "Slicing a String's UTF16View requires a Range<String.UTF16View.Index>, String.UTF16View.Index can be constructed from Int when Foundation is imported")
-    public subscript(bounds: Range<Int>) -> UTF16View {
-      Builtin.unreachable()
-    }
-#endif
-
     @inlinable // FIXME(sil-serialize-all)
     internal init(_ _guts: _StringGuts) {
       self.init(_guts, offset: 0, length: _guts.count)

stdlib/public/core/old_StringUTF16View.swift

@@ -1,5 +1,5 @@
 // RUN: %target-typecheck-verify-swift
 
 func foo(chr: Character) -> String {
-  return String(repeating: String(chr)) // expected-error {{incorrect argument label in call (have 'repeating:', expected 'stringLiteral:')}}
+  return String(repeating: String(chr)) // expected-error {{argument labels '(repeating:)' do not match any available overloads}} expected-note {{overloads for 'String' exist with these partially matching parameter lists: (Character), (from: Decoder), (cString: UnsafePointer<CChar>), (cString: UnsafePointer<UInt8>), (validatingUTF8: UnsafePointer<CChar>), (_builtinUnicodeScalarLiteral: Int32), (Unicode.Scalar), (stringLiteral: String), (T), (String), (_cocoaString: AnyObject), (stringInterpolation: String...), (stringInterpolationSegment: T), (T, radix: Int, uppercase: Bool), (S), (String.UnicodeScalarView), (String.UTF16View), (String.UTF8View), (Substring), (Substring.UTF8View), (Substring.UTF16View), (Substring.UnicodeScalarView), (String, obsoletedInSwift4: ()), (describing: Subject), (reflecting: Subject)}}
 }

test/Constraints/rdar42678836.swift

@@ -323,7 +323,7 @@ func foo() {
 
 infix operator +&
 func +&<R, S>(lhs: inout R, rhs: S) where R : RangeReplaceableCollection, S : Sequence, R.Element == S.Element {}
-// expected-note@-1 {{candidate requires that the types 'String' and 'Character' be equivalent (requirement specified as 'R.Element' == 'S.Element' [with R = [String], S = String])}}
+// expected-note@-1 {{candidate requires that the types 'String' and 'String.Element' (aka 'Character') be equivalent (requirement specified as 'R.Element' == 'S.Element' [with R = [String], S = String])}}
 
 func rdar33477726_1() {
   var arr: [String] = []
@@ -332,13 +332,13 @@ func rdar33477726_1() {
 }
 
 func rdar33477726_2<R, S>(_: R, _: S) where R: Sequence, S == R.Element {}
-// expected-note@-1 {{candidate requires that the types 'Int' and 'Character' be equivalent (requirement specified as 'S' == 'R.Element' [with R = String, S = Int])}}
+// expected-note@-1 {{candidate requires that the types 'Int' and 'String.Element' (aka 'Character') be equivalent (requirement specified as 'S' == 'R.Element' [with R = String, S = Int])}}
 rdar33477726_2("answer", 42)
 // expected-error@-1 {{cannot invoke 'rdar33477726_2(_:_:)' with an argument list of type '(String, Int)'}}
 
 prefix operator +-
 prefix func +-<T>(_: T) where T: Sequence, T.Element == Int {}
-// expected-note@-1 {{candidate requires that the types 'Character' and 'Int' be equivalent (requirement specified as 'T.Element' == 'Int' [with T = String])}}
+// expected-note@-1 {{candidate requires that the types 'String.Element' (aka 'Character') and 'Int' be equivalent (requirement specified as 'T.Element' == 'Int' [with T = String])}}
 
 +-"hello"
 // expected-error@-1 {{unary operator '+-(_:)' cannot be applied to an operand of type 'String'}}