From 972cf8c91e54bbef5c6d73ed5fc187f8d89735a8 Mon Sep 17 00:00:00 2001
From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 5 Nov 2018 07:01:49 +0000
Subject: Fix up r65505 [ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/drb/gw.rb                | 6 +++---
 lib/net/https.rb             | 2 +-
 lib/rss/maker.rb             | 4 ++--
 lib/rss/maker/0.9.rb         | 2 +-
 lib/rss/maker/1.0.rb         | 2 +-
 lib/rss/maker/2.0.rb         | 4 ++--
 lib/rss/maker/content.rb     | 4 ++--
 lib/rss/maker/dublincore.rb  | 2 +-
 lib/rss/maker/image.rb       | 2 +-
 lib/rss/maker/itunes.rb      | 2 +-
 lib/rss/maker/slash.rb       | 2 +-
 lib/rss/maker/syndication.rb | 2 +-
 lib/rss/maker/taxonomy.rb    | 2 +-
 lib/rss/maker/trackback.rb   | 4 ++--
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/drb/gw.rb b/lib/drb/gw.rb
index 5b7bf306b9..65a525476e 100644
--- a/lib/drb/gw.rb
+++ b/lib/drb/gw.rb
@@ -109,7 +109,7 @@ s2.thread.join
 =begin
 # foo.rb
 
-require_relative 'drb'
+require 'drb/drb'
 
 class Foo
   include DRbUndumped
@@ -127,7 +127,7 @@ end
 
 =begin
 # gw_a.rb
-require_relative 'unix'
+require 'drb/unix'
 require 'foo'
 
 obj = Foo.new('a')
@@ -141,7 +141,7 @@ DRb.thread.join
 
 =begin
 # gw_c.rb
-require_relative 'unix'
+require 'drb/unix'
 require 'foo'
 
 foo = Foo.new('c', nil)
diff --git a/lib/net/https.rb b/lib/net/https.rb
index 922638e137..d46721c82a 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_relative 'https' to use HTTPS.
+  require 'net/https' to use HTTPS.
 
   See Net::HTTP for details on how to make HTTPS connections.
 
diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb
index d63ae59052..e32de81806 100644
--- a/lib/rss/maker.rb
+++ b/lib/rss/maker.rb
@@ -65,8 +65,8 @@ module RSS
   end
 end
 
-require "rss/maker/1.0"
-require "rss/maker/2.0"
+require_relative "maker/1.0"
+require_relative "maker/2.0"
 require_relative "maker/feed"
 require_relative "maker/entry"
 require_relative "maker/content"
diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb
index b68730489b..7f961b392e 100644
--- a/lib/rss/maker/0.9.rb
+++ b/lib/rss/maker/0.9.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "rss/0.9"
+require_relative "../0.9"
 
 require_relative "base"
 
diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb
index 6921433b7b..3934f9536c 100644
--- a/lib/rss/maker/1.0.rb
+++ b/lib/rss/maker/1.0.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "rss/1.0"
+require_relative "../1.0"
 
 require_relative "base"
 
diff --git a/lib/rss/maker/2.0.rb b/lib/rss/maker/2.0.rb
index 1f77a014d1..43d00226b7 100644
--- a/lib/rss/maker/2.0.rb
+++ b/lib/rss/maker/2.0.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
-require "rss/2.0"
+require_relative "../2.0"
 
-require "rss/maker/0.9"
+require_relative "0.9"
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/content.rb b/lib/rss/maker/content.rb
index 42d73d1846..b3f4e5036e 100644
--- a/lib/rss/maker/content.rb
+++ b/lib/rss/maker/content.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative '../content'
-require 'rss/maker/1.0'
-require 'rss/maker/2.0'
+require_relative '1.0'
+require_relative '2.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb
index 5e490ab540..beea3134b4 100644
--- a/lib/rss/maker/dublincore.rb
+++ b/lib/rss/maker/dublincore.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require_relative '../dublincore'
-require 'rss/maker/1.0'
+require_relative '1.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb
index cde837c2b2..e3e62d8b9e 100644
--- a/lib/rss/maker/image.rb
+++ b/lib/rss/maker/image.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require_relative '../image'
-require 'rss/maker/1.0'
+require_relative '1.0'
 require_relative 'dublincore'
 
 module RSS
diff --git a/lib/rss/maker/itunes.rb b/lib/rss/maker/itunes.rb
index a442725190..28cca32021 100644
--- a/lib/rss/maker/itunes.rb
+++ b/lib/rss/maker/itunes.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require_relative '../itunes'
-require 'rss/maker/2.0'
+require_relative '2.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/slash.rb b/lib/rss/maker/slash.rb
index 898206f3ff..473991903f 100644
--- a/lib/rss/maker/slash.rb
+++ b/lib/rss/maker/slash.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require_relative '../slash'
-require 'rss/maker/1.0'
+require_relative '1.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/syndication.rb b/lib/rss/maker/syndication.rb
index fde762045d..9fd0efe99e 100644
--- a/lib/rss/maker/syndication.rb
+++ b/lib/rss/maker/syndication.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require_relative '../syndication'
-require 'rss/maker/1.0'
+require_relative '1.0'
 
 module RSS
   module Maker
diff --git a/lib/rss/maker/taxonomy.rb b/lib/rss/maker/taxonomy.rb
index d71f732634..f9858922da 100644
--- a/lib/rss/maker/taxonomy.rb
+++ b/lib/rss/maker/taxonomy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require_relative '../taxonomy'
-require 'rss/maker/1.0'
+require_relative '1.0'
 require_relative 'dublincore'
 
 module RSS
diff --git a/lib/rss/maker/trackback.rb b/lib/rss/maker/trackback.rb
index f69c9da128..f78b4058f9 100644
--- a/lib/rss/maker/trackback.rb
+++ b/lib/rss/maker/trackback.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative '../trackback'
-require 'rss/maker/1.0'
-require 'rss/maker/2.0'
+require_relative '1.0'
+require_relative '2.0'
 
 module RSS
   module Maker
-- 
cgit v1.2.3