From d54d9ba7de7094698e7009a171df013821c3b0d1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 24 Sep 2018 07:46:07 +0000
Subject: [PATCH] revert r64817: kernel_warn.rb: skip kernel_require.rb

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems.rb               |  1 -
 test/rubygems/test_require.rb | 18 ------------------
 2 files changed, 19 deletions(-)

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 9716464718..858d910610 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -1392,6 +1392,5 @@ Gem::Specification.load_defaults
 
 require 'rubygems/core_ext/kernel_gem'
 require 'rubygems/core_ext/kernel_require'
-require 'rubygems/core_ext/kernel_warn'
 
 Gem.use_gemdeps
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 65e1505bd2..ed856c7648 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -412,24 +412,6 @@ class TestGemRequire < Gem::TestCase
     end
   end
 
-  if RUBY_VERSION >= "2.5"
-    def test_no_kernel_require_in_warn_with_uplevel
-      lib = File.realpath("../../../lib", __FILE__)
-      Dir.mktmpdir("warn_test") do |dir|
-        File.write(dir + "/sub.rb", "warn 'uplevel test', uplevel: 2\n")
-        File.write(dir + "/main.rb", "require 'sub'\n")
-        _, err = capture_subprocess_io do
-          system(@@ruby, "-w", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
-        end
-        assert_equal "main.rb:1: warning: uplevel test\n", err
-        _, err = capture_subprocess_io do
-          system(@@ruby, "-w", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
-        end
-        assert_equal "main.rb:1: warning: uplevel test\n", err
-      end
-    end
-  end
-
   def silence_warnings
     old_verbose, $VERBOSE = $VERBOSE, false
     yield