summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-11-21 11:49:43 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-11-21 11:49:43 -0800
commit363fad726eb5d8b3214340df6b462900c0990758 (patch)
treead3bf2e2fe4f820b2d9ed0b5ee4691bf825687be /lib
parent8be283ffb02e95584a516cb54715d019c5046365 (diff)
downloadpsych-363fad726eb5d8b3214340df6b462900c0990758.zip
* ext/psych/lib/psych.rb: remove autoload from psych
* ext/psych/lib/psych/json.rb: ditto
Diffstat (limited to 'lib')
-rw-r--r--lib/psych.rb6
-rw-r--r--lib/psych/json.rb6
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/psych.rb b/lib/psych.rb
index 497f595..ebf2b35 100644
--- a/lib/psych.rb
+++ b/lib/psych.rb
@@ -10,7 +10,9 @@ require 'psych/set'
require 'psych/coder'
require 'psych/core_ext'
require 'psych/deprecated'
-require 'psych/json'
+require 'psych/stream'
+require 'psych/json/tree_builder'
+require 'psych/json/stream'
###
# = Overview
@@ -101,8 +103,6 @@ module Psych
class BadAlias < Exception
end
- autoload :Stream, 'psych/stream'
-
###
# Load +yaml+ in to a Ruby data structure. If multiple documents are
# provided, the object contained in the first document will be returned.
diff --git a/lib/psych/json.rb b/lib/psych/json.rb
deleted file mode 100644
index 412ab27..0000000
--- a/lib/psych/json.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Psych
- module JSON
- autoload :TreeBuilder, 'psych/json/tree_builder'
- autoload :Stream, 'psych/json/stream'
- end
-end