Merge pull request #3139 from tnir/tnir-TargetRubyVersion-3.1-in-rubocop

Set TargetRubyVersion: 3.1 for RuboCop

.rubocop.yml

@@ -12,7 +12,7 @@ AllCops:
     - !ruby/regexp /(vendor|bundle|bin|db|tmp)\/.*/
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   NewCops: enable
 
 Rails:
@@ -271,6 +271,9 @@ Style/HashAsLastArrayItem:
 Style/HashLikeCase:
   Enabled: true
 
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either
+
 Style/RedundantAssignment:
   Enabled: true
 

app/jobs/notifier.rb

@@ -29,7 +29,7 @@ def perform
 
   private
 
-  def timeout(sec, &block)
-    Timeout.timeout(sec, &block)
+  def timeout(sec, &)
+    Timeout.timeout(sec, &)
   end
 end

test/functional/api/v1/rubygems_controller_test.rb

@@ -18,15 +18,15 @@ def self.should_respond_to_show
     end
   end
 
-  def self.should_respond_to(format, &block)
+  def self.should_respond_to(format, &)
     context "with #{format.to_s.upcase} for a hosted gem" do
       setup do
         @rubygem = create(:rubygem)
         create(:version, rubygem: @rubygem)
         get :show, params: { id: @rubygem.to_param }, format: format
       end
 
-      should_respond_to_show(&block)
+      should_respond_to_show(&)
     end
 
     context "with #{format.to_s.upcase} for a hosted gem with a period in its name" do
@@ -36,7 +36,7 @@ def self.should_respond_to(format, &block)
         get :show, params: { id: @rubygem.to_param }, format: format
       end
 
-      should_respond_to_show(&block)
+      should_respond_to_show(&)
     end
 
     context "with #{format.to_s.upcase} for a gem that doesn't match the slug" do
@@ -46,7 +46,7 @@ def self.should_respond_to(format, &block)
         get :show, params: { id: "ZenTest" }, format: format
       end
 
-      should_respond_to_show(&block)
+      should_respond_to_show(&)
     end
   end
 

test/helpers/gem_helpers.rb

@@ -13,8 +13,8 @@ def build_gemspec(gemspec)
     end
   end
 
-  def build_gem(name, version, summary = "Gemcutter", platform = "ruby", &block)
-    build_gemspec(new_gemspec(name, version, summary, platform, &block))
+  def build_gem(name, version, summary = "Gemcutter", platform = "ruby", &)
+    build_gemspec(new_gemspec(name, version, summary, platform, &))
   end
 
   def new_gemspec(name, version, summary, platform, extra_args = {})