From d1ffe59ab5fd6e811833c127d43b32e87b5d7131 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sat, 27 Jul 2019 12:56:39 +0900
Subject: Use match? where we don't need MatchData

We're already running Performance/RegexpMatch cop, but it seems like the cop is not always =~ justice
---
 railties/lib/rails/code_statistics.rb            | 2 +-
 railties/lib/rails/code_statistics_calculator.rb | 2 +-
 railties/lib/rails/command/base.rb               | 2 +-
 railties/lib/rails/engine.rb                     | 2 +-
 railties/lib/rails/generators/base.rb            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index 09082282f3..aa5c0d0b5b 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -44,7 +44,7 @@ class CodeStatistics #:nodoc:
       Dir.foreach(directory) do |file_name|
         path = "#{directory}/#{file_name}"
 
-        if File.directory?(path) && (/^\./ !~ file_name)
+        if File.directory?(path) && !(/^\./.match?(file_name))
           stats.add(calculate_directory_statistics(path, pattern))
         elsif file_name&.match?(pattern)
           stats.add_by_file_path(path)
diff --git a/railties/lib/rails/code_statistics_calculator.rb b/railties/lib/rails/code_statistics_calculator.rb
index 85f86bdbd0..3925e4faeb 100644
--- a/railties/lib/rails/code_statistics_calculator.rb
+++ b/railties/lib/rails/code_statistics_calculator.rb
@@ -71,7 +71,7 @@ class CodeStatisticsCalculator #:nodoc:
 
       @classes   += 1 if patterns[:class] && line =~ patterns[:class]
       @methods   += 1 if patterns[:method] && line =~ patterns[:method]
-      if line !~ /^\s*$/ && (patterns[:line_comment].nil? || line !~ patterns[:line_comment])
+      if !line.match?(/^\s*$/) && (patterns[:line_comment].nil? || !line.match?(patterns[:line_comment]))
         @code_lines += 1
       end
     end
diff --git a/railties/lib/rails/command/base.rb b/railties/lib/rails/command/base.rb
index a22b198c66..415bab199f 100644
--- a/railties/lib/rails/command/base.rb
+++ b/railties/lib/rails/command/base.rb
@@ -52,7 +52,7 @@ module Rails
         def inherited(base) #:nodoc:
           super
 
-          if base.name && base.name !~ /Base$/
+          if base.name && !base.name.match?(/Base$/)
             Rails::Command.subclasses << base
           end
         end
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 46f1d38b96..b4c0028b1f 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -362,7 +362,7 @@ module Rails
           base.called_from = begin
             call_stack = caller_locations.map { |l| l.absolute_path || l.path }
 
-            File.dirname(call_stack.detect { |p| p !~ %r[railties[\w.-]*/lib/rails|rack[\w.-]*/lib/rack] })
+            File.dirname(call_stack.detect { |p| !p.match?(%r[railties[\w.-]*/lib/rails|rack[\w.-]*/lib/rack]) })
           end
         end
 
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index a153923ce3..1d3c947cb0 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -233,7 +233,7 @@ module Rails
         # Invoke source_root so the default_source_root is set.
         base.source_root
 
-        if base.name && base.name !~ /Base$/
+        if base.name && !base.name.match?(/Base$/)
           Rails::Generators.subclasses << base
 
           Rails::Generators.templates_path.each do |path|
-- 
cgit v1.2.3