From e859e668d2eb59f34ad18edb7458ce90076617e9 Mon Sep 17 00:00:00 2001
From: marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Nov 2018 17:52:33 +0000
Subject: lib/*: Prefer require_relative over require.

[#15206] [Fix GH-1976]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/ftp.rb         | 2 +-
 lib/net/http/status.rb | 2 +-
 lib/net/https.rb       | 4 ++--
 lib/net/imap.rb        | 2 +-
 lib/net/pop.rb         | 2 +-
 lib/net/smtp.rb        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/net')

diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 9902f9dc65..e68d825dcf 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -17,7 +17,7 @@
 
 require "socket"
 require "monitor"
-require "net/protocol"
+require_relative "protocol"
 require "time"
 begin
   require "openssl"
diff --git a/lib/net/http/status.rb b/lib/net/http/status.rb
index cd4dcb095e..b3995f763f 100644
--- a/lib/net/http/status.rb
+++ b/lib/net/http/status.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'net/http'
+require_relative '../http'
 
 if $0 == __FILE__
   require 'open-uri'
diff --git a/lib/net/https.rb b/lib/net/https.rb
index 58cb6ddf19..922638e137 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -4,7 +4,7 @@
 = net/https -- SSL/TLS enhancement for Net::HTTP.
 
   This file has been merged with net/http.  There is no longer any need to
-  require 'net/https' to use HTTPS.
+  require_relative 'https' to use HTTPS.
 
   See Net::HTTP for details on how to make HTTPS connections.
 
@@ -19,5 +19,5 @@
 
 =end
 
-require 'net/http'
+require_relative 'http'
 require 'openssl'
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 4debec8d54..fa9b19071a 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -18,7 +18,7 @@ require "socket"
 require "monitor"
 require "digest/md5"
 require "strscan"
-require 'net/protocol'
+require_relative 'protocol'
 begin
   require "openssl"
 rescue LoadError
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 92a4fe7303..a6374cd78c 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -21,7 +21,7 @@
 # See Net::POP3 for documentation.
 #
 
-require 'net/protocol'
+require_relative 'protocol'
 require 'digest/md5'
 require 'timeout'
 
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 1777a7fa7e..86b55d278b 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -17,7 +17,7 @@
 # See Net::SMTP for documentation.
 #
 
-require 'net/protocol'
+require_relative 'protocol'
 require 'digest/md5'
 require 'timeout'
 begin
-- 
cgit v1.2.3