Skip to content

Commit

Permalink
Resolve SwiftLint Warnings (Jounce#167)
Browse files Browse the repository at this point in the history
* 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)'
  • Loading branch information
mattt authored May 12, 2020
1 parent b150e4f commit de80b69
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
41 changes: 21 additions & 20 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ disabled_rules:
- trailing_comma
- redundant_discardable_let
- void_return

- implicit_return

opt_in_rules:
- array_init
- attributes
Expand Down Expand Up @@ -45,22 +46,22 @@ opt_in_rules:

file_header:
required_pattern: |
\/\/ Copyright © .*
\/\/
\/\/ Permission is hereby granted, free of charge, to any person obtaining a copy
\/\/ of this software and associated documentation files \(the "Software"\), to deal
\/\/ in the Software without restriction, including without limitation the rights
\/\/ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
\/\/ copies of the Software, and to permit persons to whom the Software is
\/\/ furnished to do so, subject to the following conditions:
\/\/
\/\/ The above copyright notice and this permission notice shall be included in
\/\/ all copies or substantial portions of the Software\.
\/\/
\/\/ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
\/\/ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
\/\/ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
\/\/ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
\/\/ 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
\/\/ THE SOFTWARE\.
// Copyright © .*
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files \(the "Software"\), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software\.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// 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
// THE SOFTWARE\.
1 change: 1 addition & 0 deletions Tests/SurgeTests/MatrixTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,7 @@ class MatrixTests: XCTestCase {
guard a.count == b.count else {
return false
}

return !zip(a, b).contains { a, e -> Bool in
!(abs(a.0 - e.0) < accuracy && abs(a.1 - e.1) < accuracy)
}
Expand Down

0 comments on commit de80b69

Please sign in to comment.