diff --git a/.swiftlint.yml b/.swiftlint.yml index 2adceb13b..d952431ac 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,7 +1,6 @@ identifier_name: min_length: 1 max_length: 50 - allowed_patterns: ^_.*$ line_length: warning: 200 @@ -12,3 +11,5 @@ line_length: disabled_rules: - todo +excluded: + - Modules/Secrets/Sources/Secrets/SecretKey.swift diff --git a/Modules/Parser/Sources/Parser/SAX/SAXParser.swift b/Modules/Parser/Sources/Parser/SAX/SAXParser.swift index baafcb5a4..dac6a6e2b 100644 --- a/Modules/Parser/Sources/Parser/SAX/SAXParser.swift +++ b/Modules/Parser/Sources/Parser/SAX/SAXParser.swift @@ -11,7 +11,7 @@ import libxml2 public typealias XMLPointer = UnsafePointer -public protocol SAXParserDelegate { +public protocol SAXParserDelegate: AnyObject { func saxParser(_: SAXParser, xmlStartElement: XMLPointer, prefix: XMLPointer?, uri: XMLPointer?, namespaceCount: Int, namespaces: UnsafePointer?, attributeCount: Int, attributesDefaultedCount: Int, attributes: UnsafePointer?) @@ -22,7 +22,7 @@ public protocol SAXParserDelegate { public final class SAXParser { - fileprivate let delegate: SAXParserDelegate + private weak var delegate: SAXParserDelegate? public var currentCharacters: Data? { // UTF-8 encoded @@ -140,17 +140,17 @@ private extension SAXParser { characters.append(xmlCharacters, count: count) } - delegate.saxParser(self, xmlCharactersFound: xmlCharacters, count: count) + delegate?.saxParser(self, xmlCharactersFound: xmlCharacters, count: count) } func startElement(_ name: XMLPointer, prefix: XMLPointer?, uri: XMLPointer?, namespaceCount: Int, namespaces: UnsafePointer?, attributeCount: Int, attributesDefaultedCount: Int, attributes: UnsafePointer?) { - delegate.saxParser(self, xmlStartElement: name, prefix: prefix, uri: uri, namespaceCount: namespaceCount, namespaces: namespaces, attributeCount: attributeCount, attributesDefaultedCount: attributesDefaultedCount, attributes: attributes) + delegate?.saxParser(self, xmlStartElement: name, prefix: prefix, uri: uri, namespaceCount: namespaceCount, namespaces: namespaces, attributeCount: attributeCount, attributesDefaultedCount: attributesDefaultedCount, attributes: attributes) } func endElement(_ name: XMLPointer, prefix: XMLPointer?, uri: XMLPointer?) { - delegate.saxParser(self, xmlEndElement: name, prefix: prefix, uri: uri) + delegate?.saxParser(self, xmlEndElement: name, prefix: prefix, uri: uri) endStoringCharacters() } } diff --git a/Modules/RSWeb/Sources/RSWeb/String+RSWeb.swift b/Modules/RSWeb/Sources/RSWeb/String+RSWeb.swift index 198bba279..e8ae4e627 100644 --- a/Modules/RSWeb/Sources/RSWeb/String+RSWeb.swift +++ b/Modules/RSWeb/Sources/RSWeb/String+RSWeb.swift @@ -18,22 +18,21 @@ public extension String { for char in self { switch char { - case "&": - escaped.append("&") - case "<": - escaped.append("<") - case ">": - escaped.append(">") - case "\"": - escaped.append(""") - case "'": - escaped.append("'") - default: - escaped.append(char) + case "&": + escaped.append("&") + case "<": + escaped.append("<") + case ">": + escaped.append(">") + case "\"": + escaped.append(""") + case "'": + escaped.append("'") + default: + escaped.append(char) } } return escaped } - }