Switch Rubocop to Ruby 3.2

andrykonchin · andrykonchin · commit 9aac6f7ad737 · 2025-05-02T20:05:26.000+03:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
   DisplayCopNames: true
   Exclude:
     - command_line/fixtures/bad_syntax.rb
diff --git a/library/set/add_spec.rb b/library/set/add_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/add'
 
 describe "Set#add" do
diff --git a/library/set/append_spec.rb b/library/set/append_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/add'
 
 describe "Set#<<" do
diff --git a/library/set/case_compare_spec.rb b/library/set/case_compare_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/include'
-require 'set'
 
 describe "Set#===" do
   it_behaves_like :set_include, :===
diff --git a/library/set/case_equality_spec.rb b/library/set/case_equality_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/include'
-require 'set'
 
 describe "Set#===" do
   it_behaves_like :set_include, :===
diff --git a/library/set/classify_spec.rb b/library/set/classify_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#classify" do
   before :each do
diff --git a/library/set/clear_spec.rb b/library/set/clear_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#clear" do
   before :each do
diff --git a/library/set/collect_spec.rb b/library/set/collect_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/collect'
 
 describe "Set#collect!" do
diff --git a/library/set/compare_by_identity_spec.rb b/library/set/compare_by_identity_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#compare_by_identity" do
   it "compares its members by identity" do
diff --git a/library/set/comparison_spec.rb b/library/set/comparison_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#<=>" do
   it "returns 0 if the sets are equal" do
diff --git a/library/set/constructor_spec.rb b/library/set/constructor_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set[]" do
   it "returns a new Set populated with the passed Objects" do
diff --git a/library/set/delete_if_spec.rb b/library/set/delete_if_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#delete_if" do
   before :each do
diff --git a/library/set/delete_spec.rb b/library/set/delete_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#delete" do
   before :each do
diff --git a/library/set/difference_spec.rb b/library/set/difference_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/difference'
 
 describe "Set#difference" do
diff --git a/library/set/disjoint_spec.rb b/library/set/disjoint_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#disjoint?" do
   it "returns false when two Sets have at least one element in common" do
diff --git a/library/set/divide_spec.rb b/library/set/divide_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#divide" do
   it "divides self into a set of subsets based on the blocks return values" do
diff --git a/library/set/each_spec.rb b/library/set/each_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#each" do
   before :each do
diff --git a/library/set/empty_spec.rb b/library/set/empty_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#empty?" do
   it "returns true if self is empty" do
diff --git a/library/set/enumerable/to_set_spec.rb b/library/set/enumerable/to_set_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../../spec_helper'
-require 'set'
 
 describe "Enumerable#to_set" do
   it "returns a new Set created from self" do
diff --git a/library/set/eql_spec.rb b/library/set/eql_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#eql?" do
   it "returns true when the passed argument is a Set and contains the same elements" do
diff --git a/library/set/equal_value_spec.rb b/library/set/equal_value_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#==" do
   it "returns true when the passed Object is a Set and self and the Object contain the same elements" do
diff --git a/library/set/exclusion_spec.rb b/library/set/exclusion_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#^" do
   before :each do
diff --git a/library/set/fixtures/set_like.rb b/library/set/fixtures/set_like.rb
@@ -1,4 +1,3 @@
-require 'set'
 
 module SetSpecs
   # This class is used to test the interaction of "Set-like" objects with real Sets
diff --git a/library/set/flatten_merge_spec.rb b/library/set/flatten_merge_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#flatten_merge" do
   it "is protected" do
diff --git a/library/set/flatten_spec.rb b/library/set/flatten_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0'
 
 describe "Set#flatten" do
diff --git a/library/set/hash_spec.rb b/library/set/hash_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#hash" do
   it "is static" do
diff --git a/library/set/include_spec.rb b/library/set/include_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/include'
-require 'set'
 
 describe "Set#include?" do
   it_behaves_like :set_include, :include?
diff --git a/library/set/initialize_clone_spec.rb b/library/set/initialize_clone_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#initialize_clone" do
   # See https://bugs.ruby-lang.org/issues/14266
diff --git a/library/set/initialize_spec.rb b/library/set/initialize_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#initialize" do
   it "is private" do
diff --git a/library/set/inspect_spec.rb b/library/set/inspect_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/inspect'
-require 'set'
 
 describe "Set#inspect" do
   it_behaves_like :set_inspect, :inspect
diff --git a/library/set/intersect_spec.rb b/library/set/intersect_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#intersect?" do
   it "returns true when two Sets have at least one element in common" do
diff --git a/library/set/intersection_spec.rb b/library/set/intersection_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/intersection'
-require 'set'
 
 describe "Set#intersection" do
   it_behaves_like :set_intersection, :intersection
diff --git a/library/set/join_spec.rb b/library/set/join_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#join" do
   it "returns an empty string if the Set is empty" do
diff --git a/library/set/keep_if_spec.rb b/library/set/keep_if_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#keep_if" do
   before :each do
diff --git a/library/set/length_spec.rb b/library/set/length_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/length'
-require 'set'
 
 describe "Set#length" do
   it_behaves_like :set_length, :length
diff --git a/library/set/map_spec.rb b/library/set/map_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/collect'
 
 describe "Set#map!" do
diff --git a/library/set/member_spec.rb b/library/set/member_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/include'
-require 'set'
 
 describe "Set#member?" do
   it_behaves_like :set_include, :member?
diff --git a/library/set/merge_spec.rb b/library/set/merge_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#merge" do
   it "adds the elements of the passed Enumerable to self" do
diff --git a/library/set/minus_spec.rb b/library/set/minus_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/difference'
 
 describe "Set#-" do
diff --git a/library/set/plus_spec.rb b/library/set/plus_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/union'
-require 'set'
 
 describe "Set#+" do
   it_behaves_like :set_union, :+
diff --git a/library/set/pretty_print_cycle_spec.rb b/library/set/pretty_print_cycle_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#pretty_print_cycle" do
   it "passes the 'pretty print' representation of a self-referencing Set to the pretty print writer" do
diff --git a/library/set/proper_subset_spec.rb b/library/set/proper_subset_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0'
 
 describe "Set#proper_subset?" do
diff --git a/library/set/proper_superset_spec.rb b/library/set/proper_superset_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#proper_superset?" do
   before :each do
diff --git a/library/set/reject_spec.rb b/library/set/reject_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#reject!" do
   before :each do
diff --git a/library/set/replace_spec.rb b/library/set/replace_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#replace" do
   before :each do
diff --git a/library/set/shared/select.rb b/library/set/shared/select.rb
@@ -1,5 +1,4 @@
 require_relative '../../../spec_helper'
-require 'set'
 
 describe :set_select_bang, shared: true do
   before :each do
diff --git a/library/set/size_spec.rb b/library/set/size_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/length'
-require 'set'
 
 describe "Set#size" do
   it_behaves_like :set_length, :size
diff --git a/library/set/sortedset/sortedset_spec.rb b/library/set/sortedset/sortedset_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../../spec_helper'
-require 'set'
 
 describe "SortedSet" do
   it "raises error including message that it has been extracted from the set stdlib" do
diff --git a/library/set/subset_spec.rb b/library/set/subset_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0'
 
 describe "Set#subset?" do
diff --git a/library/set/subtract_spec.rb b/library/set/subtract_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#subtract" do
   before :each do
diff --git a/library/set/superset_spec.rb b/library/set/superset_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#superset?" do
   before :each do
diff --git a/library/set/to_a_spec.rb b/library/set/to_a_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#to_a" do
   it "returns an array containing elements of self" do
diff --git a/library/set/to_s_spec.rb b/library/set/to_s_spec.rb
@@ -1,6 +1,5 @@
 require_relative "../../spec_helper"
 require_relative 'shared/inspect'
-require 'set'
 
 describe "Set#to_s" do
   it_behaves_like :set_inspect, :to_s
diff --git a/library/set/union_spec.rb b/library/set/union_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/union'
-require 'set'
 
 describe "Set#union" do
   it_behaves_like :set_union, :union

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`require_relative '../../spec_helper'`
`2`		`-require 'set'`
`3`	`2`	`require_relative 'shared/add'`
`4`	`3`
`5`	`4`	`describe "Set#add" do`