Merge pull request #28 from JanNash/remove-deprecated-call-to-String.characters

fangpenlin · web-flow · commit 98239cf2249b · 2018-02-01T13:21:37.000-08:00
Remove calls to deprecated String.characters property
diff --git a/Ambassador/Router.swift b/Ambassador/Router.swift
@@ -62,7 +62,7 @@ open class Router: WebApp {
             let matches = regex.matches(
                 in: searchPath,
                 options: [],
-                range: NSRange(location: 0, length: searchPath.characters.count)
+                range: NSRange(location: 0, length: searchPath.count)
             )
             if !matches.isEmpty {
                 let searchPath = searchPath as NSString
diff --git a/AmbassadorTests/DataResponseTests.swift b/AmbassadorTests/DataResponseTests.swift
@@ -54,7 +54,7 @@ class DataResponseTests: XCTestCase {
             items: receivedHeaders ?? []
         )
         XCTAssertEqual(headersDict["Content-Type"], "application/my-format")
-        XCTAssertEqual(Int(headersDict["Content-Length"] ?? "0"), "hello".characters.count)
+        XCTAssertEqual(Int(headersDict["Content-Length"] ?? "0"), "hello".count)
         XCTAssertEqual(headersDict["X-Foo-Bar"], "header")
 
         XCTAssertEqual(receivedData.count, 2)

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ open class Router: WebApp {`
`62`	`62`	`let matches = regex.matches(`
`63`	`63`	`in: searchPath,`
`64`	`64`	`options: [],`
`65`		`- range: NSRange(location: 0, length: searchPath.characters.count)`
	`65`	`+ range: NSRange(location: 0, length: searchPath.count)`
`66`	`66`	`)`
`67`	`67`	`if !matches.isEmpty {`
`68`	`68`	`let searchPath = searchPath as NSString`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class DataResponseTests: XCTestCase {`
`54`	`54`	`items: receivedHeaders ?? []`
`55`	`55`	`)`
`56`	`56`	`XCTAssertEqual(headersDict["Content-Type"], "application/my-format")`
`57`		`- XCTAssertEqual(Int(headersDict["Content-Length"] ?? "0"), "hello".characters.count)`
	`57`	`+ XCTAssertEqual(Int(headersDict["Content-Length"] ?? "0"), "hello".count)`
`58`	`58`	`XCTAssertEqual(headersDict["X-Foo-Bar"], "header")`
`59`	`59`
`60`	`60`	`XCTAssertEqual(receivedData.count, 2)`