Merge pull request #3542 from apple/stdlib-reenable-string-test

stdlib: re-enable validation-test/stdlib/String.swift

Author: gottesmm

validation-test/stdlib/String.swift

@@ -1,6 +1,5 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
-// REQUIRES: rdar27381049
 
 // XFAIL: interpret
 
@@ -1127,18 +1126,18 @@ StringTests.test("indexConversion")
   .skip(.nativeRuntime("Foundation dependency"))
   .code {
 #if _runtime(_ObjC)
-  let re : RegularExpression
+  let re : NSRegularExpression
   do {
-    re = try RegularExpression(
-      pattern: "([^ ]+)er", options: RegularExpression.Options())
+    re = try NSRegularExpression(
+      pattern: "([^ ]+)er", options: NSRegularExpression.Options())
   } catch { fatalError("couldn't build regexp: \(error)") }
 
   let s = "go further into the larder to barter."
 
   var matches: [String] = []
 
   re.enumerateMatches(
-    in: s, options: RegularExpression.MatchingOptions(), range: NSRange(0..<s.utf16.count)
+    in: s, options: NSRegularExpression.MatchingOptions(), range: NSRange(0..<s.utf16.count)
   ) {
     result, flags, stop
   in