From d3d718c1b0df32f59311aa009e62da709c04786b Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 9 Jul 2023 22:24:50 -0700
Subject: [PATCH] Replace uses of forEach with for-in loops.

---
 ...eedlyCreateFeedsForCollectionFoldersOperation.swift |  2 +-
 Account/Sources/Account/OPMLNormalizer.swift           |  6 +++---
 .../Account/ReaderAPI/ReaderAPIAccountDelegate.swift   | 10 +++++-----
 .../Sources/ArticlesDatabase/SearchTable.swift         |  6 ++++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift
index 3b331bbc1..f8502ad47 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift
@@ -92,7 +92,7 @@ final class FeedlyCreateFeedsForCollectionFoldersOperation: FeedlyOperation, Log
 			}
 		
 		logger.debug("Processing \(feedsAndFolders.count, privacy: .public) feeds.")
-		feedsAndFolders.forEach { (feed, folder) in
+        for (feed, folder) in feedsAndFolders {
 			if !folder.has(feed) {
 				folder.addFeed(feed)
 			}
diff --git a/Account/Sources/Account/OPMLNormalizer.swift b/Account/Sources/Account/OPMLNormalizer.swift
index 77f6ee54b..b16b243cb 100644
--- a/Account/Sources/Account/OPMLNormalizer.swift
+++ b/Account/Sources/Account/OPMLNormalizer.swift
@@ -22,13 +22,13 @@ final class OPMLNormalizer {
 	private func normalize(_ items: [RSOPMLItem], parentFolder: RSOPMLItem? = nil) {
 		var feedsToAdd = [RSOPMLItem]()
 
-		items.forEach { (item) in
+        for item in items {
 
 			if let _ = item.feedSpecifier {
 				if !feedsToAdd.contains(where: { $0.feedSpecifier?.feedURL == item.feedSpecifier?.feedURL }) {
 					feedsToAdd.append(item)
 				}
-				return
+				continue
 			}
 
 			guard let _ = item.titleFromAttributes else {
@@ -36,7 +36,7 @@ final class OPMLNormalizer {
 				if let itemChildren = item.children {
 					normalize(itemChildren, parentFolder: parentFolder)
 				}
-				return
+                continue
 			}
 
 			feedsToAdd.append(item)
diff --git a/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift b/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
index 00afe4015..9eca30775 100644
--- a/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
+++ b/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
@@ -716,7 +716,7 @@ private extension ReaderAPIAccountDelegate {
 
 		// Delete any folders not at Reader
 		if let folders = account.folders {
-			folders.forEach { folder in
+            for folder in folders {
 				if !readerFolderExternalIDs.contains(folder.externalID ?? "") {
 					for feed in folder.topLevelFeeds {
 						account.addFeed(feed)
@@ -736,7 +736,7 @@ private extension ReaderAPIAccountDelegate {
 		}()
 
 		// Make any folders Reader has, but we don't
-		folderTags.forEach { tag in
+        for tag in folderTags {
 			if !folderExternalIDs.contains(tag.tagID) {
 				let folder = account.ensureFolder(with: tag.folderName ?? "None")
 				folder?.externalID = tag.tagID
@@ -773,7 +773,7 @@ private extension ReaderAPIAccountDelegate {
 		}
 		
 		// Add any feeds we don't have and update any we do
-		subscriptions.forEach { subscription in
+        for subscription in subscriptions {
 			
 			if let feed = account.existingFeed(withFeedID: subscription.feedID) {
 				feed.name = subscription.name
@@ -799,14 +799,14 @@ private extension ReaderAPIAccountDelegate {
 		let taggingsDict = subscriptions.reduce([String: [ReaderAPISubscription]]()) { (dict, subscription) in
 			var taggedFeeds = dict
 			
-			subscription.categories.forEach({ (category) in
+            for category in subscription.categories {
 				if var taggedFeed = taggedFeeds[category.categoryId] {
 					taggedFeed.append(subscription)
 					taggedFeeds[category.categoryId] = taggedFeed
 				} else {
 					taggedFeeds[category.categoryId] = [subscription]
 				}
-			})
+			}
 			
 			return taggedFeeds
 		}
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift b/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
index ed08439f4..08b9413bd 100644
--- a/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
+++ b/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
@@ -132,7 +132,9 @@ final class SearchTable: DatabaseTable {
 private extension SearchTable {
 
 	func performInitialIndexForArticles(_ articles: Set<ArticleSearchInfo>, _ database: FMDatabase) {
-		articles.forEach { performInitialIndex($0, database) }
+		for article in articles {
+            performInitialIndex(article, database)
+        }
 	}
 
 	func performInitialIndex(_ article: ArticleSearchInfo, _ database: FMDatabase) {
@@ -177,7 +179,7 @@ private extension SearchTable {
 		let groupedSearchInfos = Dictionary(grouping: searchInfos, by: { $0.rowID })
 		let searchInfosDictionary = groupedSearchInfos.mapValues { $0.first! }
 
-		articles.forEach { (article) in
+        for article in articles {
 			updateIndexForArticle(article, searchInfosDictionary, database)
 		}
 	}