Skip to content

Commit a6e77b4

Browse files
authored
Merge pull request swiftlang#924 from ianpartridge/nsregularexpression
2 parents bd53bb6 + 34f440c commit a6e77b4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Foundation/NSRegularExpression.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ open class NSRegularExpression: NSObject, NSCopying, NSCoding {
7575
/* An instance of NSRegularExpression is created from a regular expression pattern and a set of options. If the pattern is invalid, nil will be returned and an NSError will be returned by reference. The pattern syntax currently supported is that specified by ICU.
7676
*/
7777

78-
public init(pattern: String, options: Options) throws {
78+
public init(pattern: String, options: Options = []) throws {
7979
var error: Unmanaged<CFError>?
8080
#if os(OSX) || os(iOS)
8181
let opt = _CFRegularExpressionOptions(rawValue: options.rawValue)

TestFoundation/TestNSRegularExpression.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class TestNSRegularExpression : XCTestCase {
3535
do {
3636
let str = NSString(string: searchString)
3737
var range = NSMakeRange(0, str.length)
38-
let regex = try NSRegularExpression(pattern: patternString, options: [])
38+
let regex = try NSRegularExpression(pattern: patternString)
3939
do {
4040
let lookingRange = regex.rangeOfFirstMatch(in: searchString, options: .anchored, range: range)
4141
let matchRange = regex.rangeOfFirstMatch(in: searchString, options: [], range: range)

0 commit comments

Comments
 (0)