Skip to content

Fix Swift 3.1 warnings #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1ec5 merged 1 commit into from
Mar 30, 2017
Merged

Fix Swift 3.1 warnings #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions OSRMTextInstructions/OSRMTextInstructions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class OSRMInstructionFormatter: Formatter {
}

required public init?(coder decoder: NSCoder) {
if let version = decoder.decodeObject(of: NSString.self, forKey: "version") as? String {
if let version = decoder.decodeObject(of: NSString.self, forKey: "version") as String? {
self.version = version
} else {
return nil
Expand Down Expand Up @@ -240,7 +240,7 @@ public class OSRMInstructionFormatter: Formatter {
var buffer: NSString?

if scanner.scanUpTo("{", into: &buffer) {
result += buffer as! String
result += buffer! as String
}
guard scanner.scanString("{", into: nil) else {
continue
Expand All @@ -252,7 +252,7 @@ public class OSRMInstructionFormatter: Formatter {
}

if scanner.scanString("}", into: nil) {
if let tokenType = TokenType(description: token as! String) {
if let tokenType = TokenType(description: token! as String) {
var replacement: String
switch tokenType {
case .wayName: replacement = wayName
Expand All @@ -271,7 +271,7 @@ public class OSRMInstructionFormatter: Formatter {
}
}
} else {
result += token as! String
result += token! as String
}

}
Expand Down