rubocop: remove conflicted rules

Since trailing commas in method argument lists are a syntax error in
1.8, let's enforce the default rule of `TrailingComma`(i.e. `no_comma`)

Closes Homebrew/homebrew#42398.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-08-03 16:42:42 +08:00
parent 670ca78eaa
commit 3b68215be7

View File

@ -74,10 +74,6 @@ Style/PercentLiteralDelimiters:
'%W': '[]'
'%x': '()'
# comma on last element is editor friendly
Style/TrailingComma:
EnforcedStyleForMultiline: comma
# conflicts with DSL-style path concatenation with `/`
Style/SpaceAroundOperators:
Enabled: false
@ -123,10 +119,6 @@ Style/TrailingBlankLines:
Style/SignalException:
EnforcedStyle: only_raise
# trailing commas in method argument lists are a syntax error in 1.8
Style/TrailingComma:
Enabled: false
# we prefer compact if-else-end/case-when-end alignment
Lint/EndAlignment:
AlignWith: variable