From 6f48fe2d917aa2842bd61e9903ebab12c734483d Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Tue, 18 Apr 2017 23:02:37 +0100 Subject: [PATCH] fix: Resolve build warnings related to throwables and Any? Closes #99 Closes #106 --- Sources/Context.swift | 2 +- Sources/Loader.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/Context.swift b/Sources/Context.swift index a87ddb9..60bec17 100644 --- a/Sources/Context.swift +++ b/Sources/Context.swift @@ -42,7 +42,7 @@ public class Context { } /// Pop the last level off of the Context - fileprivate func pop() -> [String: Any]? { + fileprivate func pop() -> [String: Any?]? { return dictionaries.popLast() } diff --git a/Sources/Loader.swift b/Sources/Loader.swift index a5457c9..c12e9c4 100644 --- a/Sources/Loader.swift +++ b/Sources/Loader.swift @@ -52,7 +52,7 @@ public class FileSystemLoader: Loader, CustomStringConvertible { } let content: String = try templatePath.read() - return try environment.templateClass.init(templateString: content, environment: environment, name: name) + return environment.templateClass.init(templateString: content, environment: environment, name: name) } throw TemplateDoesNotExist(templateNames: [name], loader: self) @@ -65,7 +65,7 @@ public class FileSystemLoader: Loader, CustomStringConvertible { if templatePath.exists { let content: String = try templatePath.read() - return try environment.templateClass.init(templateString: content, environment: environment, name: templateName) + return environment.templateClass.init(templateString: content, environment: environment, name: templateName) } } }