Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefer require_relative for internal requires #522

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions lib/psych.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# frozen_string_literal: true
require 'psych/versions'
require_relative 'psych/versions'
case RUBY_ENGINE
when 'jruby'
require 'psych_jars'
require_relative 'psych_jars'
if JRuby::Util.respond_to?(:load_ext)
JRuby::Util.load_ext('org.jruby.ext.psych.PsychLibrary')
else
Expand All @@ -12,21 +12,21 @@
else
require 'psych.so'
end
require 'psych/nodes'
require 'psych/streaming'
require 'psych/visitors'
require 'psych/handler'
require 'psych/tree_builder'
require 'psych/parser'
require 'psych/omap'
require 'psych/set'
require 'psych/coder'
require 'psych/core_ext'
require 'psych/stream'
require 'psych/json/tree_builder'
require 'psych/json/stream'
require 'psych/handlers/document_stream'
require 'psych/class_loader'
require_relative 'psych/nodes'
require_relative 'psych/streaming'
require_relative 'psych/visitors'
require_relative 'psych/handler'
require_relative 'psych/tree_builder'
require_relative 'psych/parser'
require_relative 'psych/omap'
require_relative 'psych/set'
require_relative 'psych/coder'
require_relative 'psych/core_ext'
require_relative 'psych/stream'
require_relative 'psych/json/tree_builder'
require_relative 'psych/json/stream'
require_relative 'psych/handlers/document_stream'
require_relative 'psych/class_loader'

###
# = Overview
Expand Down
4 changes: 2 additions & 2 deletions lib/psych/class_loader.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true
require 'psych/omap'
require 'psych/set'
require_relative 'omap'
require_relative 'set'

module Psych
class ClassLoader # :nodoc:
Expand Down
2 changes: 1 addition & 1 deletion lib/psych/core_ext.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ def to_yaml options = {}
end

if defined?(::IRB)
require 'psych/y'
require_relative 'y'
end
2 changes: 1 addition & 1 deletion lib/psych/handlers/document_stream.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
require 'psych/tree_builder'
require_relative '../tree_builder'

module Psych
module Handlers
Expand Down
2 changes: 1 addition & 1 deletion lib/psych/handlers/recorder.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
require 'psych/handler'
require_relative '../handler'

module Psych
module Handlers
Expand Down
4 changes: 2 additions & 2 deletions lib/psych/json/stream.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true
require 'psych/json/ruby_events'
require 'psych/json/yaml_events'
require_relative 'ruby_events'
require_relative 'yaml_events'

module Psych
module JSON
Expand Down
2 changes: 1 addition & 1 deletion lib/psych/json/tree_builder.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
require 'psych/json/yaml_events'
require_relative 'yaml_events'

module Psych
module JSON
Expand Down
14 changes: 7 additions & 7 deletions lib/psych/nodes.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# frozen_string_literal: true
require 'psych/nodes/node'
require 'psych/nodes/stream'
require 'psych/nodes/document'
require 'psych/nodes/sequence'
require 'psych/nodes/scalar'
require 'psych/nodes/mapping'
require 'psych/nodes/alias'
require_relative 'nodes/node'
require_relative 'nodes/stream'
require_relative 'nodes/document'
require_relative 'nodes/sequence'
require_relative 'nodes/scalar'
require_relative 'nodes/mapping'
require_relative 'nodes/alias'

module Psych
###
Expand Down
4 changes: 2 additions & 2 deletions lib/psych/nodes/node.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require 'stringio'
require 'psych/class_loader'
require 'psych/scalar_scanner'
require_relative '../class_loader'
require_relative '../scalar_scanner'

module Psych
module Nodes
Expand Down
2 changes: 1 addition & 1 deletion lib/psych/syntax_error.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
require 'psych/exception'
require_relative 'exception'

module Psych
class SyntaxError < Psych::Exception
Expand Down
2 changes: 1 addition & 1 deletion lib/psych/tree_builder.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
require 'psych/handler'
require_relative 'handler'

module Psych
###
Expand Down
12 changes: 6 additions & 6 deletions lib/psych/visitors.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require 'psych/visitors/visitor'
require 'psych/visitors/to_ruby'
require 'psych/visitors/emitter'
require 'psych/visitors/yaml_tree'
require 'psych/visitors/json_tree'
require 'psych/visitors/depth_first'
require_relative 'visitors/visitor'
require_relative 'visitors/to_ruby'
require_relative 'visitors/emitter'
require_relative 'visitors/yaml_tree'
require_relative 'visitors/json_tree'
require_relative 'visitors/depth_first'
2 changes: 1 addition & 1 deletion lib/psych/visitors/json_tree.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
require 'psych/json/ruby_events'
require_relative '../json/ruby_events'

module Psych
module Visitors
Expand Down
6 changes: 3 additions & 3 deletions lib/psych/visitors/to_ruby.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require 'psych/scalar_scanner'
require 'psych/class_loader'
require 'psych/exception'
require_relative '../scalar_scanner'
require_relative '../class_loader'
require_relative '../exception'

unless defined?(Regexp::NOENCODING)
Regexp::NOENCODING = 32
Expand Down
6 changes: 3 additions & 3 deletions lib/psych/visitors/yaml_tree.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require 'psych/tree_builder'
require 'psych/scalar_scanner'
require 'psych/class_loader'
require_relative '../tree_builder'
require_relative '../scalar_scanner'
require_relative '../class_loader'

module Psych
module Visitors
Expand Down