Resolve SwiftLint Warnings (#167)

* Disable implicit_return rule

* Unescape slashes in file header pattern

Decrease indentation level for file header pattern

* Fix 'warning: Contains over first not nil Violation: Prefer `contains` over `first(where:) != nil` (contains_over_first_not_nil)'

* Fix 'warning: Mark Violation: MARK comment should be in valid format. e.g. '// MARK: ...' or '// MARK: - ...' (mark)'
This commit is contained in:
Mattt 2020-05-12 07:44:58 -07:00 committed by GitHub
parent b150e4f895
commit de80b69526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 20 deletions

View File

@ -5,7 +5,8 @@ disabled_rules:
- trailing_comma - trailing_comma
- redundant_discardable_let - redundant_discardable_let
- void_return - void_return
- implicit_return
opt_in_rules: opt_in_rules:
- array_init - array_init
- attributes - attributes
@ -45,22 +46,22 @@ opt_in_rules:
file_header: file_header:
required_pattern: | required_pattern: |
\/\/ Copyright © .* // Copyright © .*
\/\/ //
\/\/ Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
\/\/ of this software and associated documentation files \(the "Software"\), to deal // of this software and associated documentation files \(the "Software"\), to deal
\/\/ in the Software without restriction, including without limitation the rights // in the Software without restriction, including without limitation the rights
\/\/ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
\/\/ copies of the Software, and to permit persons to whom the Software is // copies of the Software, and to permit persons to whom the Software is
\/\/ furnished to do so, subject to the following conditions: // furnished to do so, subject to the following conditions:
\/\/ //
\/\/ The above copyright notice and this permission notice shall be included in // The above copyright notice and this permission notice shall be included in
\/\/ all copies or substantial portions of the Software\. // all copies or substantial portions of the Software\.
\/\/ //
\/\/ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
\/\/ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
\/\/ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
\/\/ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
\/\/ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
\/\/ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
\/\/ THE SOFTWARE\. // THE SOFTWARE\.

View File

@ -1037,6 +1037,7 @@ class MatrixTests: XCTestCase {
guard a.count == b.count else { guard a.count == b.count else {
return false return false
} }
return !zip(a, b).contains { a, e -> Bool in return !zip(a, b).contains { a, e -> Bool in
!(abs(a.0 - e.0) < accuracy && abs(a.1 - e.1) < accuracy) !(abs(a.0 - e.0) < accuracy && abs(a.1 - e.1) < accuracy)
} }