From cd53001457a5609f0afb68f7cb134a7b45f4f1fc Mon Sep 17 00:00:00 2001
From: Igor <Kislyuk>
Date: Thu, 7 Sep 2017 14:01:29 +0300
Subject: [PATCH 1/5] Update identifier + parameter count

---
 .swiftlint.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 730c175..be42b92 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -35,6 +35,12 @@ type_body_length:
 file_length:
   warning: 500
   error: 1200
+identifier_name:
+  min_length:
+   error: 4
+function_parameter_count:
+  error: 5
+
 warning_threshold: 1
 
 custom_rules:

From 3e27226635e58599fd8e1a9a1db9cd2f534f0bea Mon Sep 17 00:00:00 2001
From: Igor <Kislyuk>
Date: Thu, 7 Sep 2017 15:12:05 +0300
Subject: [PATCH 2/5] Reorder

---
 .swiftlint.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index be42b92..a37b481 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -1,27 +1,39 @@
 disabled_rules:
   - identifier_name
 opt_in_rules:
-  - private_outlet
   - closure_spacing
   - closure_end_indentation
+  - conditional_returns_on_newline
+
   - empty_count
   - explicit_init
   - extension_access_modifier
+
   - fatal_error_message
   - file_header
   - first_where
   - force_unwrapping
+
   - implicit_return
+  - identifier_name
+
   - let_var_whitespace
+
   - multiline_parameters
+
   - nimble_operator - discuss
-  - conditional_returns_on_newline
   - number_separator
+
   - object_literal
   - overridden_super_call
+
+  - private_outlet
   - prohibited_super_call
+
   - redundant_nil_coalescing
+
   - unneeded_parentheses_in_closure_argument
+
   - vertical_parameter_alignment_on_call
 excluded:
   - Carthage
@@ -35,9 +47,6 @@ type_body_length:
 file_length:
   warning: 500
   error: 1200
-identifier_name:
-  min_length:
-   error: 4
 function_parameter_count:
   error: 5
 

From 854e8ba70aba7c91536bf769b59e6c7074c41288 Mon Sep 17 00:00:00 2001
From: Igor <Kislyuk>
Date: Thu, 7 Sep 2017 15:21:42 +0300
Subject: [PATCH 3/5] Update identifier_name

---
 .swiftlint.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index a37b481..ce7bfcb 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -1,5 +1,3 @@
-disabled_rules:
-  - identifier_name
 opt_in_rules:
   - closure_spacing
   - closure_end_indentation
@@ -15,7 +13,6 @@ opt_in_rules:
   - force_unwrapping
 
   - implicit_return
-  - identifier_name
 
   - let_var_whitespace
 
@@ -35,21 +32,34 @@ opt_in_rules:
   - unneeded_parentheses_in_closure_argument
 
   - vertical_parameter_alignment_on_call
+
 excluded:
   - Carthage
   - Pods
   - Generated
 
 line_length: 128
+
 type_body_length:
   - 500 # warning
   - 700 # error
+
 file_length:
   warning: 500
   error: 1200
+
 function_parameter_count:
   error: 5
 
+identifier_name:
+  excluded:
+    - ok
+    - x
+    - y
+    - z
+    - id
+    - URL
+
 warning_threshold: 1
 
 custom_rules:

From f7d2a0734f0ddb11ddfd4d8f9bccf4d3dd75cfb0 Mon Sep 17 00:00:00 2001
From: Igor <Kislyuk>
Date: Thu, 7 Sep 2017 15:25:39 +0300
Subject: [PATCH 4/5] Update words.

---
 .swiftlint.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index ce7bfcb..4722a2f 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -53,12 +53,16 @@ function_parameter_count:
 
 identifier_name:
   excluded:
+    - id
+    - key
+    - min
+    - max
+    - mid
     - ok
+    - URL
     - x
     - y
     - z
-    - id
-    - URL
 
 warning_threshold: 1
 

From 0a6f1073e274aa568b3ae835e7a57b48f763308b Mon Sep 17 00:00:00 2001
From: Igor <Kislyuk>
Date: Thu, 7 Sep 2017 15:29:13 +0300
Subject: [PATCH 5/5] Remove keys

---
 .swiftlint.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 4722a2f..6a27cd8 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -54,10 +54,6 @@ function_parameter_count:
 identifier_name:
   excluded:
     - id
-    - key
-    - min
-    - max
-    - mid
     - ok
     - URL
     - x