Merge pull request #7167 from MikeMcQuaid/linelength

rubocop: set LineLength to 118.

Library/.rubocop.yml

@@ -78,9 +78,9 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
-# GitHub diff UI wraps beyond 118 characters (so that's the goal)
+# GitHub diff UI wraps beyond 118 characters
 Layout/LineLength:
-  Max: 167
+  Max: 118
   # ignore manpage comments and long single-line strings
   IgnoredPatterns: ['#: ', ' url "', ' mirror "', ' plist_options :']
 

Library/.rubocop_shared.yml

@@ -58,9 +58,9 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: true
 
-# This shouldn't be enabled until LineLength is lower.
+# Enabled now LineLength is lowish.
 Style/IfUnlessModifier:
-  Enabled: false
+  Enabled: true
 
 # Only use this for numbers >= `1_000_000`.
 Style/NumericLiterals:

Library/Homebrew/.rubocop.yml

@@ -61,12 +61,6 @@ Metrics/PerceivedComplexity:
   Enabled: true
   Max: 100
 
-# GitHub diff UI wraps beyond 118 characters
-Layout/LineLength:
-  Max: 118
-  # ignore manpage comments
-  IgnoredPatterns: ['#: ']
-
 # we won't change backward compatible predicate names
 Naming/PredicateName:
   Exclude: