Remove redundant guard from FontConvertible.url

SwiftGen · Aug 22, 2017 · c32fb38 · c32fb38
1 parent 05e3b0d
commit c32fb38
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 24 deletions.
diff --git a/Tests/Expected/Fonts/swift2-context-defaults-customname.swift b/Tests/Expected/Fonts/swift2-context-defaults-customname.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: NSURL? {
     let bundle = NSBundle(forClass: BundleToken.self)
-    guard let url = bundle.URLForResource(path, withExtension: nil) else { return nil }
-    return url
+    return bundle.URLForResource(path, withExtension: nil)
   }
 }
 

diff --git a/Tests/Expected/Fonts/swift2-context-defaults-preservepath.swift b/Tests/Expected/Fonts/swift2-context-defaults-preservepath.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: NSURL? {
     let bundle = NSBundle(forClass: BundleToken.self)
-    guard let url = bundle.URLForResource(path, withExtension: nil) else { return nil }
-    return url
+    return bundle.URLForResource(path, withExtension: nil)
   }
 }
 

diff --git a/Tests/Expected/Fonts/swift2-context-defaults.swift b/Tests/Expected/Fonts/swift2-context-defaults.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: NSURL? {
     let bundle = NSBundle(forClass: BundleToken.self)
-    guard let url = bundle.URLForResource(path, withExtension: nil) else { return nil }
-    return url
+    return bundle.URLForResource(path, withExtension: nil)
   }
 }
 

diff --git a/Tests/Expected/Fonts/swift3-context-defaults-customname.swift b/Tests/Expected/Fonts/swift3-context-defaults-customname.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: URL? {
     let bundle = Bundle(for: BundleToken.self)
-    guard let url = bundle.url(forResource: path, withExtension: nil) else { return nil }
-    return url
+    return bundle.url(forResource: path, withExtension: nil)
   }
 }
 

diff --git a/Tests/Expected/Fonts/swift3-context-defaults-preservepath.swift b/Tests/Expected/Fonts/swift3-context-defaults-preservepath.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: URL? {
     let bundle = Bundle(for: BundleToken.self)
-    guard let url = bundle.url(forResource: path, withExtension: nil) else { return nil }
-    return url
+    return bundle.url(forResource: path, withExtension: nil)
   }
 }
 

diff --git a/Tests/Expected/Fonts/swift3-context-defaults.swift b/Tests/Expected/Fonts/swift3-context-defaults.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: URL? {
     let bundle = Bundle(for: BundleToken.self)
-    guard let url = bundle.url(forResource: path, withExtension: nil) else { return nil }
-    return url
+    return bundle.url(forResource: path, withExtension: nil)
   }
 }
 

diff --git a/Tests/Expected/Fonts/swift4-context-defaults-customname.swift b/Tests/Expected/Fonts/swift4-context-defaults-customname.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: URL? {
     let bundle = Bundle(for: BundleToken.self)
-    guard let url = bundle.url(forResource: path, withExtension: nil) else { return nil }
-    return url
+    return bundle.url(forResource: path, withExtension: nil)
   }
 }
 

diff --git a/Tests/Expected/Fonts/swift4-context-defaults-preservepath.swift b/Tests/Expected/Fonts/swift4-context-defaults-preservepath.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: URL? {
     let bundle = Bundle(for: BundleToken.self)
-    guard let url = bundle.url(forResource: path, withExtension: nil) else { return nil }
-    return url
+    return bundle.url(forResource: path, withExtension: nil)
   }
 }
 

diff --git a/Tests/Expected/Fonts/swift4-context-defaults.swift b/Tests/Expected/Fonts/swift4-context-defaults.swift
@@ -27,8 +27,7 @@ struct FontConvertible {
 
   fileprivate var url: URL? {
     let bundle = Bundle(for: BundleToken.self)
-    guard let url = bundle.url(forResource: path, withExtension: nil) else { return nil }
-    return url
+    return bundle.url(forResource: path, withExtension: nil)
   }
 }
 

diff --git a/templates/fonts/swift2.stencil b/templates/fonts/swift2.stencil
@@ -28,8 +28,7 @@ struct FontConvertible {
 
   fileprivate var url: NSURL? {
     let bundle = NSBundle(forClass: BundleToken.self)
-    guard let url = bundle.URLForResource(path, withExtension: nil) else { return nil }
-    return url
+    return bundle.URLForResource(path, withExtension: nil)
   }
 }
 

diff --git a/templates/fonts/swift3.stencil b/templates/fonts/swift3.stencil
@@ -28,8 +28,7 @@ struct FontConvertible {
 
   fileprivate var url: URL? {
     let bundle = Bundle(for: BundleToken.self)
-    guard let url = bundle.url(forResource: path, withExtension: nil) else { return nil }
-    return url
+    return bundle.url(forResource: path, withExtension: nil)
   }
 }
 

diff --git a/templates/fonts/swift4.stencil b/templates/fonts/swift4.stencil
@@ -28,8 +28,7 @@ struct FontConvertible {
 
   fileprivate var url: URL? {
     let bundle = Bundle(for: BundleToken.self)
-    guard let url = bundle.url(forResource: path, withExtension: nil) else { return nil }
-    return url
+    return bundle.url(forResource: path, withExtension: nil)
   }
 }