From 45f310847bb059e6e8505b37aa9bb1ba10a5902a Mon Sep 17 00:00:00 2001 From: Peter Boling Date: Fri, 10 Nov 2023 13:18:17 +0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Order=20closer=20to=20actual=20p?= =?UTF-8?q?recedence=20of=20rules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/ruby-1.8.yml | 8 ++++---- config/ruby-1.9.yml | 8 ++++---- config/ruby-2.0.yml | 8 ++++---- config/ruby-2.1.yml | 9 +++++---- config/ruby-2.2.yml | 8 ++++---- config/ruby-2.3.yml | 8 ++++---- config/ruby-2.4.yml | 8 ++++---- config/ruby-2.5.yml | 8 ++++---- config/ruby-2.6.yml | 8 ++++---- config/ruby-2.7.yml | 18 +++++++++--------- config/ruby-3.0.yml | 8 ++++---- config/ruby-3.1.yml | 8 ++++---- config/ruby-3.2.yml | 17 ++++++----------- config/ruby-3.3.yml | 12 ++++++------ 14 files changed, 66 insertions(+), 70 deletions(-) diff --git a/config/ruby-1.8.yml b/config/ruby-1.8.yml index 765fcba..6e0eb54 100644 --- a/config/ruby-1.8.yml +++ b/config/ruby-1.8.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-1.8.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/ruby-1.8.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-1.8.yml diff --git a/config/ruby-1.9.yml b/config/ruby-1.9.yml index 5aa9106..7c3805c 100644 --- a/config/ruby-1.9.yml +++ b/config/ruby-1.9.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-1.9.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/ruby-1.9.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-1.9.yml diff --git a/config/ruby-2.0.yml b/config/ruby-2.0.yml index 37d9450..500cb85 100644 --- a/config/ruby-2.0.yml +++ b/config/ruby-2.0.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-2.0.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/ruby-2.0.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-2.0.yml diff --git a/config/ruby-2.1.yml b/config/ruby-2.1.yml index 857350d..18ecb63 100644 --- a/config/ruby-2.1.yml +++ b/config/ruby-2.1.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-2.1.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,8 @@ inherit_gem: standard-performance: config/ruby-2.1.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + + +inherit_from: + - ./base.yml + - ./internal/ruby-2.1.yml diff --git a/config/ruby-2.2.yml b/config/ruby-2.2.yml index 6b0bc33..4ba9daa 100644 --- a/config/ruby-2.2.yml +++ b/config/ruby-2.2.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-2.2.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/ruby-2.2.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-2.2.yml diff --git a/config/ruby-2.3.yml b/config/ruby-2.3.yml index 3305ef0..16c7a0b 100644 --- a/config/ruby-2.3.yml +++ b/config/ruby-2.3.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-2.3.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/base.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-2.3.yml diff --git a/config/ruby-2.4.yml b/config/ruby-2.4.yml index b16b2c8..397f145 100644 --- a/config/ruby-2.4.yml +++ b/config/ruby-2.4.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-2.4.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/base.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-2.4.yml diff --git a/config/ruby-2.5.yml b/config/ruby-2.5.yml index ca7d155..aabc3f7 100644 --- a/config/ruby-2.5.yml +++ b/config/ruby-2.5.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-2.5.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/base.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-2.5.yml diff --git a/config/ruby-2.6.yml b/config/ruby-2.6.yml index 603f0ec..4797315 100644 --- a/config/ruby-2.6.yml +++ b/config/ruby-2.6.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-2.6.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/base.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-2.6.yml diff --git a/config/ruby-2.7.yml b/config/ruby-2.7.yml index 39bbd19..705dcee 100644 --- a/config/ruby-2.7.yml +++ b/config/ruby-2.7.yml @@ -5,16 +5,12 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-2.7.yml - require: - standard-rubocop-lts - - standard - - standard-performance - - standard-custom - - rubocop-performance +# - standard +# - standard-performance +# - standard-custom +# - rubocop-performance # Load basic rules for this version of Ruby from standard. # Rules are overridden in a LIFO stack. @@ -26,4 +22,8 @@ inherit_gem: standard: config/ruby-2.7.yml standard-performance: config/base.yml standard-custom: config/base.yml - rubocop-performance: config/default.yml +# rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-2.7.yml diff --git a/config/ruby-3.0.yml b/config/ruby-3.0.yml index de08652..14812cb 100644 --- a/config/ruby-3.0.yml +++ b/config/ruby-3.0.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-3.0.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/base.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-3.0.yml diff --git a/config/ruby-3.1.yml b/config/ruby-3.1.yml index be1c538..5b15e07 100644 --- a/config/ruby-3.1.yml +++ b/config/ruby-3.1.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-3.1.yml - require: - standard-rubocop-lts - standard @@ -27,3 +23,7 @@ inherit_gem: standard-performance: config/base.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-3.1.yml diff --git a/config/ruby-3.2.yml b/config/ruby-3.2.yml index e46f016..1428ed2 100644 --- a/config/ruby-3.2.yml +++ b/config/ruby-3.2.yml @@ -5,16 +5,8 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-3.2.yml - -require: - - standard-rubocop-lts - - standard - - standard-performance - - standard-custom - - rubocop-performance +#require: +# - rubocop-performance # Load basic rules for this version of Ruby from standard. # Rules are overridden in a LIFO stack. @@ -26,4 +18,7 @@ inherit_gem: standard: config/ruby-3.2.yml standard-performance: config/base.yml standard-custom: config/base.yml - rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-3.2.yml diff --git a/config/ruby-3.3.yml b/config/ruby-3.3.yml index 4770dc9..3479a53 100644 --- a/config/ruby-3.3.yml +++ b/config/ruby-3.3.yml @@ -5,10 +5,6 @@ inherit_mode: - Exclude - Include -inherit_from: - - ./base.yml - - ./internal/ruby-3.3.yml - require: - standard-rubocop-lts - standard @@ -16,10 +12,10 @@ require: - standard-custom - rubocop-performance -# TODO: Load basic rules for this version of Ruby from standard, once Standard includes it! -# See: https://github.com/standardrb/standard/pull/560 +# TODO: Load basic rules for Ruby 3.3 from Standard once they exist! # inherit_gem: # standard: config/ruby-3.3.yml + # Rules are overridden in a LIFO stack. # If rubocop-performance is listed first, and standard-performance after it, # then rubocop-performance's rules will take precedence. @@ -30,3 +26,7 @@ inherit_gem: standard-performance: config/base.yml standard-custom: config/base.yml rubocop-performance: config/default.yml + +inherit_from: + - ./base.yml + - ./internal/ruby-3.3.yml