From 0be7211082fe8d5226e64a27a9b2741b682bcc86 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 2 Feb 2025 10:25:04 -0800 Subject: [PATCH] Simplify some code. --- Shared/ArticleRendering/ArticleRenderer.swift | 3 +-- Shared/ArticleStyles/ArticleTheme.swift | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Shared/ArticleRendering/ArticleRenderer.swift b/Shared/ArticleRendering/ArticleRenderer.swift index 99dbaead5..ab0883e3f 100644 --- a/Shared/ArticleRendering/ArticleRenderer.swift +++ b/Shared/ArticleRendering/ArticleRenderer.swift @@ -191,8 +191,7 @@ private extension ArticleRenderer { static let defaultTemplate: String = { let path = Bundle.main.path(forResource: "template", ofType: "html")! - let s = try! String(contentsOfFile: path, encoding: .utf8) - return s as String + return try! String(contentsOfFile: path, encoding: .utf8) }() func styleString() -> String { diff --git a/Shared/ArticleStyles/ArticleTheme.swift b/Shared/ArticleStyles/ArticleTheme.swift index 9c1e031a1..9c3cd69f5 100644 --- a/Shared/ArticleStyles/ArticleTheme.swift +++ b/Shared/ArticleStyles/ArticleTheme.swift @@ -87,10 +87,7 @@ struct ArticleTheme: Equatable { } var encoding = String.Encoding.utf8 - if let s = try? String(contentsOfFile: f, usedEncoding: &encoding) { - return s - } - return nil + return try? String(contentsOfFile: f, usedEncoding: &encoding) } static func filenameWithThemeSuffixRemoved(_ filename: String) -> String {