diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-21 19:47:09 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-21 19:47:09 +0000 |
| commit | daeaa65f088aa541fa6a9345208b6988fe22bf4d (patch) | |
| tree | 093c2d44fbcdacd0a00e6da85d7376ff3e6e029c | |
| parent | 19bca2e6b203e4b25b5b14a6907177b1267d927d (diff) | |
* ext/psych/lib/psych.rb: remove autoload from psych
* ext/psych/lib/psych/json.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/psych/lib/psych.rb | 6 | ||||
| -rw-r--r-- | ext/psych/lib/psych/json.rb | 6 |
3 files changed, 8 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Tue Nov 22 04:46:22 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych.rb: remove autoload from psych + * ext/psych/lib/psych/json.rb: ditto + Tue Nov 22 00:44:59 2011 Tanaka Akira <akr@fsij.org> * test/ruby/test_io.rb (test_fcntl_dupfd): the argument of F_DUPFD is diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index 497f5952a3..ebf2b35d14 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/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/ext/psych/lib/psych/json.rb b/ext/psych/lib/psych/json.rb deleted file mode 100644 index 412ab2708b..0000000000 --- a/ext/psych/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 |