Let RuboCop set TargetRubyVersion value from rails.gemspec

yahonda · yahonda · commit 29c7580f9586 · 2024-09-28T05:50:46.000-04:00
Rails main branch requires Ruby 3.2.0. This commit removes the TargetRubyVersion setting from .rubocop.yml, allowing RuboCop to determine the value from the rails.gemspec file. Since RuboCop 1.3.0, it has supported setting TargetRubyVersion directly from gemspec files. In Ruby 3.2, the Set class was made built-in, so it no longer requires require 'set'. https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/ > Set is now available as a builtin class without the need for require "set" then it addresses the following `Lint/RedundantRequireStatement` not to run `require "set"`. and removes the two extra lines after removing the `require "set"` manually. ```ruby $ bundle exec rubocop -A Inspecting 3324 files ... snip ... Offenses: actioncable/lib/action_cable/channel/base.rb:5:1: W: [Corrected] Lint/RedundantRequireStatement: Remove unnecessary require statement. require "set" ^^^^^^^^^^^^^ ... snip ... tools/rail_inspector/lib/rail_inspector/visitor/attribute.rb:3:1: W: [Corrected] Lint/RedundantRequireStatement: Remove unnecessary require statement. require "set" ^^^^^^^^^^^^^ 3324 files inspected, 25 offenses detected, 25 offenses corrected $ ``` Follow up rails#53041 Refer to https://github.com/rubocop/rubocop/releases/tag/v1.3.0 rubocop/rubocop#8761
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -6,7 +6,6 @@ require:
   - rubocop-md
 
 AllCops:
-  TargetRubyVersion: 3.1
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
diff --git a/actioncable/lib/action_cable/channel/base.rb b/actioncable/lib/action_cable/channel/base.rb
@@ -2,7 +2,6 @@
 
 # :markup: markdown
 
-require "set"
 require "active_support/rescuable"
 require "active_support/parameter_filter"
 
diff --git a/actioncable/lib/action_cable/connection/identification.rb b/actioncable/lib/action_cable/connection/identification.rb
@@ -2,8 +2,6 @@
 
 # :markup: markdown
 
-require "set"
-
 module ActionCable
   module Connection
     module Identification
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "abstract_unit"
-require "set"
 
 require "action_dispatch"
 require "active_support/time"
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
@@ -5,7 +5,6 @@
 require "abstract_controller/error"
 require "action_view"
 require "action_view/view_paths"
-require "set"
 
 module AbstractController
   class DoubleRenderError < Error
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
@@ -2,8 +2,6 @@
 
 # :markup: markdown
 
-require "set"
-
 module ActionController
   # See Renderers.add
   def self.add_renderer(key, &block)
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -10,7 +10,6 @@
 require "action_dispatch/http/upload"
 require "rack/test"
 require "stringio"
-require "set"
 require "yaml"
 
 module ActionController
diff --git a/actionview/lib/action_view/helpers/atom_feed_helper.rb b/actionview/lib/action_view/helpers/atom_feed_helper.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module ActionView
   module Helpers # :nodoc:
     # = Action View Atom Feed \Helpers
diff --git a/actionview/lib/action_view/helpers/tag_helper.rb b/actionview/lib/action_view/helpers/tag_helper.rb
@@ -4,7 +4,6 @@
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/string/output_safety"
 require "active_support/core_ext/string/inflections"
-require "set"
 require "action_view/helpers/capture_helper"
 require "action_view/helpers/output_safety_helper"
 
diff --git a/actionview/test/actionpack/abstract/abstract_controller_test.rb b/actionview/test/actionpack/abstract/abstract_controller_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "abstract_unit"
-require "set"
 
 module AbstractController
   module Testing
diff --git a/activejob/lib/active_job/serializers.rb b/activejob/lib/active_job/serializers.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module ActiveJob
   # = Active Job \Serializers
   #
diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module ActiveRecord
   module AttributeMethods
     # = Active Record Attribute Methods Primary Key
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "active_record/connection_adapters/sql_type_metadata"
 require "active_record/connection_adapters/abstract/schema_dumper"
 require "active_record/connection_adapters/abstract/schema_creation"
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
@@ -2,7 +2,6 @@
 
 require "erb"
 require "yaml"
-require "set"
 require "active_support/dependencies"
 require "active_support/core_ext/digest/uuid"
 require "active_record/test_fixtures"
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "active_support/core_ext/array/access"
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/module/attribute_accessors"
diff --git a/activesupport/lib/active_support/delegation.rb b/activesupport/lib/active_support/delegation.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module ActiveSupport
   # Error generated by +delegate+ when a method is called on +nil+ and +allow_nil+
   # option is not used.
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "active_support/dependencies/interlock"
 
 module ActiveSupport # :nodoc:
diff --git a/activesupport/lib/active_support/evented_file_update_checker.rb b/activesupport/lib/active_support/evented_file_update_checker.rb
@@ -3,7 +3,6 @@
 gem "listen", "~> 3.5"
 require "listen"
 
-require "set"
 require "pathname"
 require "concurrent/atomic/atomic_boolean"
 
diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "concurrent/map"
-require "set"
 require "active_support/core_ext/object/try"
 
 module ActiveSupport
diff --git a/activesupport/test/core_ext/class_test.rb b/activesupport/test/core_ext/class_test.rb
@@ -3,7 +3,6 @@
 require_relative "../abstract_unit"
 require "active_support/core_ext/class"
 require "active_support/descendants_tracker"
-require "set"
 
 class ClassTest < ActiveSupport::TestCase
   class Parent; end
diff --git a/activesupport/test/descendants_tracker_test.rb b/activesupport/test/descendants_tracker_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "abstract_unit"
-require "set"
 require "active_support/descendants_tracker"
 
 class DescendantsTrackerTest < ActiveSupport::TestCase
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "fileutils"
-require "set"
 require "active_support/notifications"
 require "active_support/dependencies"
 require "active_support/descendants_tracker"
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/array/conversions"
 require "active_support/descendants_tracker"
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
@@ -3,7 +3,6 @@
 require "isolation/abstract_unit"
 require "rack/test"
 require "env_helpers"
-require "set"
 
 class ::MyMailInterceptor
   def self.delivering_email(email); email; end
diff --git a/railties/test/application/zeitwerk_integration_test.rb b/railties/test/application/zeitwerk_integration_test.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "isolation/abstract_unit"
 
 class ZeitwerkIntegrationTest < ActiveSupport::TestCase
diff --git a/tools/rail_inspector/lib/rail_inspector/visitor/attribute.rb b/tools/rail_inspector/lib/rail_inspector/visitor/attribute.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "syntax_tree"
 
 module RailInspector
