ruby-changes:53291
From: marcandre <ko1@a...>
Date: Sat, 3 Nov 2018 03:10:27 +0900 (JST)
Subject: [ruby-changes:53291] marcandRe: r65506 (trunk): lib/*: Prefer require_relative over require, remove explicit extension
marcandre 2018-11-03 02:52:43 +0900 (Sat, 03 Nov 2018) New Revision: 65506 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65506 Log: lib/*: Prefer require_relative over require, remove explicit extension [#15206] [Fix GH-1976] Modified files: trunk/lib/irb/cmd/chws.rb trunk/lib/irb/cmd/help.rb trunk/lib/irb/cmd/load.rb trunk/lib/irb/cmd/pushws.rb trunk/lib/irb/cmd/subirb.rb trunk/lib/irb/context.rb trunk/lib/irb/help.rb trunk/lib/irb/input-method.rb trunk/lib/irb/notifier.rb trunk/lib/irb/ruby-lex.rb trunk/lib/rss/rss.rb trunk/lib/shell/command-processor.rb trunk/lib/unicode_normalize/normalize.rb trunk/lib/webrick/httpservlet/erbhandler.rb trunk/lib/webrick/httpservlet/prochandler.rb Index: lib/unicode_normalize/normalize.rb =================================================================== --- lib/unicode_normalize/normalize.rb (revision 65505) +++ lib/unicode_normalize/normalize.rb (revision 65506) @@ -18,7 +18,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/unicode_normalize/normalize.rb#L18 # content are purely an implementation detail, and should not be exposed in # any test or spec or otherwise. -require 'unicode_normalize/tables.rb' +require_relative 'tables' module UnicodeNormalize # :nodoc: Index: lib/shell/command-processor.rb =================================================================== --- lib/shell/command-processor.rb (revision 65505) +++ lib/shell/command-processor.rb (revision 65506) @@ -14,8 +14,8 @@ require "e2mmap" https://github.com/ruby/ruby/blob/trunk/lib/shell/command-processor.rb#L14 require_relative "error" require_relative "filter" -require "shell/system-command" -require "shell/builtin-command" +require_relative "system-command" +require_relative "builtin-command" class Shell # In order to execute a command on your OS, you need to define it as a Index: lib/webrick/httpservlet/prochandler.rb =================================================================== --- lib/webrick/httpservlet/prochandler.rb (revision 65505) +++ lib/webrick/httpservlet/prochandler.rb (revision 65506) @@ -9,7 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpservlet/prochandler.rb#L9 # # $IPR: prochandler.rb,v 1.7 2002/09/21 12:23:42 gotoyuzo Exp $ -require 'webrick/httpservlet/abstract.rb' +require_relative 'abstract' module WEBrick module HTTPServlet Index: lib/webrick/httpservlet/erbhandler.rb =================================================================== --- lib/webrick/httpservlet/erbhandler.rb (revision 65505) +++ lib/webrick/httpservlet/erbhandler.rb (revision 65506) @@ -9,7 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpservlet/erbhandler.rb#L9 # # $IPR: erbhandler.rb,v 1.25 2003/02/24 19:25:31 gotoyuzo Exp $ -require 'webrick/httpservlet/abstract.rb' +require_relative 'abstract' require 'erb' Index: lib/rss/rss.rb =================================================================== --- lib/rss/rss.rb (revision 65505) +++ lib/rss/rss.rb (revision 65506) @@ -65,7 +65,7 @@ end https://github.com/ruby/ruby/blob/trunk/lib/rss/rss.rb#L65 require "English" require_relative "utils" require_relative "converter" -require "rss/xml-stylesheet" +require_relative "xml-stylesheet" module RSS Index: lib/irb/ruby-lex.rb =================================================================== --- lib/irb/ruby-lex.rb (revision 65505) +++ lib/irb/ruby-lex.rb (revision 65506) @@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/ruby-lex.rb#L12 require "e2mmap" require_relative "slex" -require "irb/ruby-token" +require_relative "ruby-token" # :stopdoc: class RubyLex Index: lib/irb/input-method.rb =================================================================== --- lib/irb/input-method.rb (revision 65505) +++ lib/irb/input-method.rb (revision 65506) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/input-method.rb#L10 # # require_relative 'src_encoding' -require 'irb/magic-file' +require_relative 'magic-file' module IRB STDIN_FILE_NAME = "(line)" # :nodoc: Index: lib/irb/notifier.rb =================================================================== --- lib/irb/notifier.rb (revision 65505) +++ lib/irb/notifier.rb (revision 65506) @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/notifier.rb#L11 # require "e2mmap" -require "irb/output-method" +require_relative "output-method" module IRB # An output formatter used internally by the lexer. Index: lib/irb/context.rb =================================================================== --- lib/irb/context.rb (revision 65505) +++ lib/irb/context.rb (revision 65506) @@ -11,8 +11,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/context.rb#L11 # require_relative "workspace" require_relative "inspector" -require "irb/input-method" -require "irb/output-method" +require_relative "input-method" +require_relative "output-method" module IRB # A class that wraps the current state of the irb session, including the Index: lib/irb/help.rb =================================================================== --- lib/irb/help.rb (revision 65505) +++ lib/irb/help.rb (revision 65506) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/help.rb#L10 # # -require 'irb/magic-file' +require_relative 'magic-file' module IRB # Outputs the irb help message, see IRB@Command+line+options. Index: lib/irb/cmd/pushws.rb =================================================================== --- lib/irb/cmd/pushws.rb (revision 65505) +++ lib/irb/cmd/pushws.rb (revision 65506) @@ -10,8 +10,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/pushws.rb#L10 # # -require "irb/cmd/nop.rb" -require "irb/ext/workspaces.rb" +require_relative "nop" +require_relative "../ext/workspaces" # :stopdoc: module IRB Index: lib/irb/cmd/load.rb =================================================================== --- lib/irb/cmd/load.rb (revision 65505) +++ lib/irb/cmd/load.rb (revision 65506) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/load.rb#L10 # # -require "irb/cmd/nop.rb" +require_relative "nop" require_relative "../ext/loader" # :stopdoc: Index: lib/irb/cmd/chws.rb =================================================================== --- lib/irb/cmd/chws.rb (revision 65505) +++ lib/irb/cmd/chws.rb (revision 65506) @@ -10,8 +10,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/chws.rb#L10 # # -require "irb/cmd/nop.rb" -require "irb/ext/change-ws.rb" +require_relative "nop" +require_relative "../ext/change-ws" # :stopdoc: module IRB Index: lib/irb/cmd/subirb.rb =================================================================== --- lib/irb/cmd/subirb.rb (revision 65505) +++ lib/irb/cmd/subirb.rb (revision 65506) @@ -9,8 +9,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/subirb.rb#L9 # # -require "irb/cmd/nop.rb" -require "irb/ext/multi-irb" +require_relative "nop" +require_relative "../ext/multi-irb" # :stopdoc: module IRB Index: lib/irb/cmd/help.rb =================================================================== --- lib/irb/cmd/help.rb (revision 65505) +++ lib/irb/cmd/help.rb (revision 65506) @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/help.rb#L11 require 'rdoc/ri/driver' -require "irb/cmd/nop.rb" +require_relative "nop" # :stopdoc: module IRB -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/