Merge #7312

7312: Remove old rubies stuff no longer needed r=hsbt a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that was still some code specific to old rubies we no longer support.

### What is your fix for the problem, implemented in this PR?

My fix is to remove that code.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>

2 files changed, 2 insertions, 6 deletions

diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb
index 5dcf4a01ef..0b0e991ea5 100644
--- a/lib/bundler/cli/exec.rb
+++ b/lib/bundler/cli/exec.rb
@@ -13,7 +13,7 @@ module Bundler
       @cmd = args.shift
       @args = args
 
-      if Bundler.current_ruby.ruby_2? && !Bundler.current_ruby.jruby?
+      if !Bundler.current_ruby.jruby?
         @args << { :close_others => !options.keep_file_descriptors? }
       elsif options.keep_file_descriptors?
         Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec."
diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb
index 2c5d9e6580..463113ef8e 100644
--- a/lib/bundler/spec_set.rb
+++ b/lib/bundler/spec_set.rb
@@ -162,11 +162,7 @@ module Bundler
     end
 
     def extract_circular_gems(error)
-      if Bundler.current_ruby.mri? && Bundler.current_ruby.on_19?
-        error.message.scan(/(\w+) \([^)]/).flatten
-      else
-        error.message.scan(/@name="(.*?)"/).flatten
-      end
+      error.message.scan(/@name="(.*?)"/).flatten
     end
 
     def lookup