Skip to content

Commit 46154d9

Browse files
authoredOct 13, 2017
No Bug - Reenable swiftlint. Fix a small number of linting errors. (#3278)
1 parent c17db92 commit 46154d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+108
-100
lines changed
 

‎.swiftlint.yml

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
disabled_rules: # rule identifiers to exclude from running
22
- variable_name
3-
- legacy_cggeometry_functions
43
- todo
54
- trailing_newline
65
- type_name
76
- function_body_length
8-
- force_try
9-
- force_cast
107
- missing_docs
118
- valid_docs
129
- cyclomatic_complexity
1310
- type_body_length
1411
- function_parameter_count
15-
- trailing_whitespace
16-
- leading_whitespace
17-
- operator_whitespace
1812
- file_length
1913
- mark
2014
- unused_closure_parameter
@@ -28,6 +22,21 @@ disabled_rules: # rule identifiers to exclude from running
2822
- shorthand_operator
2923
- trailing_comma
3024
- unused_optional_binding
25+
- private_over_fileprivate
26+
- empty_enum_arguments
27+
- discarded_notification_center_observer
28+
- block_based_kvo
29+
- nesting
30+
- is_disjoint
31+
- multiple_closures_with_trailing_closure
32+
- fallthrough
33+
- switch_case_alignment
34+
- trailing_whitespace
35+
- leading_whitespace
36+
- operator_whitespace
37+
- legacy_cggeometry_functions
38+
- unneeded_break_in_switch
39+
- closure_parameter_position
3140
opt_in_rules: # some rules are only opt-in
3241
- closing_brace
3342
- opening_brace

‎Account/FxAClient10.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ open class FxAClient10 {
146146
if kB.count != 32 {
147147
return nil
148148
}
149-
return kB.sha256.subdata(in: 0..<16).hexEncodedString
149+
return kB.sha256.subdata(in: 0..<16).hexEncodedString
150150
}
151151

152152
open class func quickStretchPW(_ email: Data, password: Data) -> Data {

0 commit comments

Comments
 (0)
Please sign in to comment.