Skip to content

Commit

Permalink
lib/*: Prefer require_relative over require.
Browse files Browse the repository at this point in the history
[#15206] [Fix rubyGH-1976]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
marcandre committed Nov 2, 2018
1 parent c8c66bc commit e859e66
Show file tree
Hide file tree
Showing 126 changed files with 256 additions and 256 deletions.
2 changes: 1 addition & 1 deletion lib/cgi/cookie.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
require 'cgi/util'
require_relative 'util'
class CGI
# Class representing an HTTP cookie.
#
Expand Down
10 changes: 5 additions & 5 deletions lib/cgi/core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -862,24 +862,24 @@ def initialize(options = {}, &block) # :yields: name, value

case @options[:tag_maker]
when "html3"
require 'cgi/html'
require_relative 'html'
extend Html3
extend HtmlExtension
when "html4"
require 'cgi/html'
require_relative 'html'
extend Html4
extend HtmlExtension
when "html4Tr"
require 'cgi/html'
require_relative 'html'
extend Html4Tr
extend HtmlExtension
when "html4Fr"
require 'cgi/html'
require_relative 'html'
extend Html4Tr
extend Html4Fr
extend HtmlExtension
when "html5"
require 'cgi/html'
require_relative 'html'
extend Html5
extend HtmlExtension
end
Expand Down
2 changes: 1 addition & 1 deletion lib/cgi/session/pstore.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# persistent of session data on top of the pstore library. See
# cgi/session.rb for more details on session storage managers.

require 'cgi/session'
require_relative '../session'
require 'pstore'

class CGI
Expand Down
2 changes: 1 addition & 1 deletion lib/cgi/util.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def escapeHTML(string)
end

begin
require 'cgi/escape'
require_relative 'escape'
rescue LoadError
end

Expand Down
4 changes: 2 additions & 2 deletions lib/drb/drb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

require 'socket'
require 'io/wait'
require 'drb/eq'
require_relative 'eq'

#
# == Overview
Expand Down Expand Up @@ -1638,7 +1638,7 @@ def perform_without_block

end

require 'drb/invokemethod'
require_relative 'invokemethod'
class InvokeMethod
include InvokeMethod18Mixin
end
Expand Down
2 changes: 1 addition & 1 deletion lib/drb/extserv.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Copyright (c) 2000,2002 Masatoshi SEKI
=end

require 'drb/drb'
require_relative 'drb'
require 'monitor'

module DRb
Expand Down
2 changes: 1 addition & 1 deletion lib/drb/extservm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Copyright (c) 2000 Masatoshi SEKI
=end

require 'drb/drb'
require_relative 'drb'
require 'monitor'

module DRb
Expand Down
8 changes: 4 additions & 4 deletions lib/drb/gw.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: false
require 'drb/drb'
require_relative 'drb'
require 'monitor'

module DRb
Expand Down Expand Up @@ -109,7 +109,7 @@ def _dump(lv)
=begin
# foo.rb
require 'drb/drb'
require_relative 'drb'
class Foo
include DRbUndumped
Expand All @@ -127,7 +127,7 @@ def ping(obj)

=begin
# gw_a.rb
require 'drb/unix'
require_relative 'unix'
require 'foo'
obj = Foo.new('a')
Expand All @@ -141,7 +141,7 @@ def ping(obj)

=begin
# gw_c.rb
require 'drb/unix'
require_relative 'unix'
require 'foo'
foo = Foo.new('c', nil)
Expand Down
2 changes: 1 addition & 1 deletion lib/drb/ssl.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: false
require 'socket'
require 'openssl'
require 'drb/drb'
require_relative 'drb'
require 'singleton'

module DRb
Expand Down
2 changes: 1 addition & 1 deletion lib/drb/timeridconv.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: false
require 'drb/drb'
require_relative 'drb'
require 'monitor'

module DRb
Expand Down
2 changes: 1 addition & 1 deletion lib/drb/unix.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: false
require 'socket'
require 'drb/drb'
require_relative 'drb'
require 'tmpdir'

raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer)
Expand Down
2 changes: 1 addition & 1 deletion lib/irb/cmd/load.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#

require "irb/cmd/nop.rb"
require "irb/ext/loader"
require_relative "../ext/loader"

# :stopdoc:
module IRB
Expand Down
4 changes: 2 additions & 2 deletions lib/irb/context.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#
#
#
require "irb/workspace"
require "irb/inspector"
require_relative "workspace"
require_relative "inspector"
require "irb/input-method"
require "irb/output-method"

Expand Down
4 changes: 2 additions & 2 deletions lib/irb/ext/use-loader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#
#

require "irb/cmd/load"
require "irb/ext/loader"
require_relative "../cmd/load"
require_relative "loader"

class Object
alias __original__load__IRB_use_loader__ load
Expand Down
2 changes: 1 addition & 1 deletion lib/irb/init.rb
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def IRB.parse_opts(argv: ::ARGV)
print IRB.version, "\n"
exit 0
when "-h", "--help"
require "irb/help"
require_relative "help"
IRB.print_usage
exit 0
when "--"
Expand Down
2 changes: 1 addition & 1 deletion lib/irb/input-method.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
#
#
require 'irb/src_encoding'
require_relative 'src_encoding'
require 'irb/magic-file'

module IRB
Expand Down
2 changes: 1 addition & 1 deletion lib/irb/ruby-lex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#

require "e2mmap"
require "irb/slex"
require_relative "slex"
require "irb/ruby-token"

# :stopdoc:
Expand Down
2 changes: 1 addition & 1 deletion lib/irb/slex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#

require "e2mmap"
require "irb/notifier"
require_relative "notifier"

# :stopdoc:
module IRB
Expand Down
2 changes: 1 addition & 1 deletion lib/irb/xmp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#

require "irb"
require "irb/frame"
require_relative "frame"

# An example printer for irb.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/net/ftp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

require "socket"
require "monitor"
require "net/protocol"
require_relative "protocol"
require "time"
begin
require "openssl"
Expand Down
2 changes: 1 addition & 1 deletion lib/net/http/status.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

require 'net/http'
require_relative '../http'

if $0 == __FILE__
require 'open-uri'
Expand Down
4 changes: 2 additions & 2 deletions lib/net/https.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -19,5 +19,5 @@
=end

require 'net/http'
require_relative 'http'
require 'openssl'
2 changes: 1 addition & 1 deletion lib/net/imap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
require "monitor"
require "digest/md5"
require "strscan"
require 'net/protocol'
require_relative 'protocol'
begin
require "openssl"
rescue LoadError
Expand Down
2 changes: 1 addition & 1 deletion lib/net/pop.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# See Net::POP3 for documentation.
#

require 'net/protocol'
require_relative 'protocol'
require 'digest/md5'
require 'timeout'

Expand Down
2 changes: 1 addition & 1 deletion lib/net/smtp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# See Net::SMTP for documentation.
#

require 'net/protocol'
require_relative 'protocol'
require 'digest/md5'
require 'timeout'
begin
Expand Down
2 changes: 1 addition & 1 deletion lib/racc/parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class Parser
Racc_Runtime_Core_Version_R = '1.4.6'
Racc_Runtime_Core_Revision_R = %w$originalRevision: 1.8 $[1]
begin
require 'racc/cparse'
require_relative 'cparse'
# Racc_Runtime_Core_Version_C = (defined in extension)
Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
unless new.respond_to?(:_racc_do_parse_c, true)
Expand Down
4 changes: 2 additions & 2 deletions lib/rexml/attlistdecl.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: false
#vim:ts=2 sw=2 noexpandtab:
require 'rexml/child'
require 'rexml/source'
require_relative 'child'
require_relative 'source'

module REXML
# This class needs:
Expand Down
4 changes: 2 additions & 2 deletions lib/rexml/attribute.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: false
require "rexml/namespace"
require 'rexml/text'
require_relative "namespace"
require_relative 'text'

module REXML
# Defines an Element Attribute; IE, a attribute=value pair, as in:
Expand Down
2 changes: 1 addition & 1 deletion lib/rexml/cdata.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: false
require "rexml/text"
require_relative "text"

module REXML
class CData < Text
Expand Down
2 changes: 1 addition & 1 deletion lib/rexml/child.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: false
require "rexml/node"
require_relative "node"

module REXML
##
Expand Down
2 changes: 1 addition & 1 deletion lib/rexml/comment.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: false
require "rexml/child"
require_relative "child"

module REXML
##
Expand Down
12 changes: 6 additions & 6 deletions lib/rexml/doctype.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# frozen_string_literal: false
require "rexml/parent"
require "rexml/parseexception"
require "rexml/namespace"
require 'rexml/entity'
require 'rexml/attlistdecl'
require 'rexml/xmltokens'
require_relative "parent"
require_relative "parseexception"
require_relative "namespace"
require_relative 'entity'
require_relative 'attlistdecl'
require_relative 'xmltokens'

module REXML
# Represents an XML DOCTYPE declaration; that is, the contents of <!DOCTYPE
Expand Down
28 changes: 14 additions & 14 deletions lib/rexml/document.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# frozen_string_literal: false
require "rexml/security"
require "rexml/element"
require "rexml/xmldecl"
require "rexml/source"
require "rexml/comment"
require "rexml/doctype"
require "rexml/instruction"
require "rexml/rexml"
require "rexml/parseexception"
require "rexml/output"
require "rexml/parsers/baseparser"
require "rexml/parsers/streamparser"
require "rexml/parsers/treeparser"
require_relative "security"
require_relative "element"
require_relative "xmldecl"
require_relative "source"
require_relative "comment"
require_relative "doctype"
require_relative "instruction"
require_relative "rexml"
require_relative "parseexception"
require_relative "output"
require_relative "parsers/baseparser"
require_relative "parsers/streamparser"
require_relative "parsers/treeparser"

module REXML
# Represents a full XML document, including PIs, a doctype, etc. A
Expand Down Expand Up @@ -226,7 +226,7 @@ def write(*arguments)
end
formatter = if indent > -1
if transitive
require "rexml/formatters/transitive"
require_relative "formatters/transitive"
REXML::Formatters::Transitive.new( indent, ie_hack )
else
REXML::Formatters::Pretty.new( indent, ie_hack )
Expand Down
2 changes: 1 addition & 1 deletion lib/rexml/dtd/attlistdecl.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: false
require "rexml/child"
require_relative "../child"
module REXML
module DTD
class AttlistDecl < Child
Expand Down
Loading

0 comments on commit e859e66

Please sign in to comment.