Correctly label non-throwing functions

Remove throws from Element constructor
This commit is contained in:
Christoph Hagen
2022-09-08 09:30:54 +02:00
parent 28623d1209
commit 81b373fb5a
5 changed files with 20 additions and 20 deletions

View File

@ -141,7 +141,7 @@ struct Element {
- Parameter folder: The root folder of the site content.
- Note: Uses global objects.
*/
init?(atRoot folder: URL) throws {
init?(atRoot folder: URL) {
self.inputFolder = folder
self.path = ""
@ -175,10 +175,10 @@ struct Element {
}
files.add(page: path, id: id)
try self.readElements(in: folder, source: nil)
self.readElements(in: folder, source: nil)
}
mutating func readElements(in folder: URL, source: String?) throws {
mutating func readElements(in folder: URL, source: String?) {
let subFolders: [URL]
do {
subFolders = try FileManager.default
@ -188,13 +188,13 @@ struct Element {
log.add(error: "Failed to read subfolders", source: source ?? "root", error: error)
return
}
self.elements = try subFolders.compactMap { subFolder in
self.elements = subFolders.compactMap { subFolder in
let s = (source.unwrapped { $0 + "/" } ?? "") + subFolder.lastPathComponent
return try Element(parent: self, folder: subFolder, path: s)
return Element(parent: self, folder: subFolder, path: s)
}
}
init?(parent: Element, folder: URL, path: String) throws {
init?(parent: Element, folder: URL, path: String) {
self.inputFolder = folder
self.path = path
@ -252,7 +252,7 @@ struct Element {
// All properties initialized
files.add(page: path, id: id)
try self.readElements(in: folder, source: path)
self.readElements(in: folder, source: path)
}
}