Move optparse under the vendor directory

11 files changed, 12 insertions, 12 deletions

diff --git a/lib/rubygems/optparse.rb b/lib/rubygems/optparse.rb
index 6ed718423c..a5611d32f0 100644
--- a/lib/rubygems/optparse.rb
+++ b/lib/rubygems/optparse.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require_relative "optparse/lib/optparse"
+require_relative "vendor/optparse/lib/optparse"
diff --git a/lib/rubygems/optparse/.document b/lib/rubygems/vendor/optparse/.document
index 0c43bbd6b3..0c43bbd6b3 100644
--- a/lib/rubygems/optparse/.document
+++ b/lib/rubygems/vendor/optparse/.document
diff --git a/lib/rubygems/optparse/lib/optionparser.rb b/lib/rubygems/vendor/optparse/lib/optionparser.rb
index 4b9b40d82a..4b9b40d82a 100644
--- a/lib/rubygems/optparse/lib/optionparser.rb
+++ b/lib/rubygems/vendor/optparse/lib/optionparser.rb
diff --git a/lib/rubygems/optparse/lib/optparse.rb b/lib/rubygems/vendor/optparse/lib/optparse.rb
index 42370bf7cc..5937431720 100644
--- a/lib/rubygems/optparse/lib/optparse.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse.rb
@@ -73,7 +73,7 @@
 #
 # === Minimal example
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   options = {}
 #   Gem::OptionParser.new do |parser|
@@ -92,7 +92,7 @@
 # Gem::OptionParser can be used to automatically generate help for the commands you
 # write:
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   Options = Struct.new(:name)
 #
@@ -130,7 +130,7 @@
 # option name in all caps. If an option is used without the required argument,
 # an exception will be raised.
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   options = {}
 #   Gem::OptionParser.new do |parser|
@@ -183,8 +183,8 @@
 # as a +Time+. If it succeeds, that time will be passed to the
 # handler block. Otherwise, an exception will be raised.
 #
-#   require 'rubygems/optparse/lib/optparse'
-#   require 'rubygems/optparse/lib/optparse/time'
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse/time'
 #   Gem::OptionParser.new do |parser|
 #     parser.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
 #       p time
@@ -206,7 +206,7 @@
 # It specifies which conversion block to call whenever a class is specified.
 # The example below uses it to fetch a +User+ object before the +on+ handler receives it.
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   User = Struct.new(:id, :name)
 #
@@ -242,7 +242,7 @@
 #
 # The +into+ option of +order+, +parse+ and so on methods stores command line options into a Hash.
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   options = {}
 #   Gem::OptionParser.new do |parser|
@@ -268,8 +268,8 @@
 # effect of specifying various options.  This is probably the best way to learn
 # the features of +optparse+.
 #
-#   require 'rubygems/optparse/lib/optparse'
-#   require 'rubygems/optparse/lib/optparse/time'
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse/time'
 #   require 'ostruct'
 #   require 'pp'
 #
@@ -1084,7 +1084,7 @@ XXX
     Switch::OptionalArgument.new do |pkg|
       if pkg
         begin
-          require 'rubygems/optparse/lib/optparse/version'
+          require 'rubygems/vendor/optparse/lib/optparse/version'
         rescue LoadError
         else
           show_version(*pkg.split(/,/)) or
diff --git a/lib/rubygems/optparse/lib/optparse/ac.rb b/lib/rubygems/vendor/optparse/lib/optparse/ac.rb
index e84d01bf91..e84d01bf91 100644
--- a/lib/rubygems/optparse/lib/optparse/ac.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse/ac.rb
diff --git a/lib/rubygems/optparse/lib/optparse/date.rb b/lib/rubygems/vendor/optparse/lib/optparse/date.rb
index d9a9f4f48a..d9a9f4f48a 100644
--- a/lib/rubygems/optparse/lib/optparse/date.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse/date.rb
diff --git a/lib/rubygems/optparse/lib/optparse/kwargs.rb b/lib/rubygems/vendor/optparse/lib/optparse/kwargs.rb
index 6987a5ed62..6987a5ed62 100644
--- a/lib/rubygems/optparse/lib/optparse/kwargs.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse/kwargs.rb
diff --git a/lib/rubygems/optparse/lib/optparse/shellwords.rb b/lib/rubygems/vendor/optparse/lib/optparse/shellwords.rb
index d47ad60255..d47ad60255 100644
--- a/lib/rubygems/optparse/lib/optparse/shellwords.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse/shellwords.rb
diff --git a/lib/rubygems/optparse/lib/optparse/time.rb b/lib/rubygems/vendor/optparse/lib/optparse/time.rb
index c59e1e4ced..c59e1e4ced 100644
--- a/lib/rubygems/optparse/lib/optparse/time.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse/time.rb
diff --git a/lib/rubygems/optparse/lib/optparse/uri.rb b/lib/rubygems/vendor/optparse/lib/optparse/uri.rb
index 5c2d0b8514..398127479a 100644
--- a/lib/rubygems/optparse/lib/optparse/uri.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse/uri.rb
@@ -2,6 +2,6 @@
 # -*- ruby -*-
 
 require_relative '../optparse'
-require_relative '../../../vendor/uri/lib/uri'
+require_relative '../../../uri/lib/uri'
 
 Gem::OptionParser.accept(Gem::URI) {|s,| Gem::URI.parse(s) if s}
diff --git a/lib/rubygems/optparse/lib/optparse/version.rb b/lib/rubygems/vendor/optparse/lib/optparse/version.rb
index 5d79e9db44..5d79e9db44 100644
--- a/lib/rubygems/optparse/lib/optparse/version.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse/version.rb