tenderlove	2011-11-22 04:47:09 +0900 (Tue, 22 Nov 2011)

  New Revision: 33809

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33809

  Log:
    * ext/psych/lib/psych.rb: remove autoload from psych
    * ext/psych/lib/psych/json.rb: ditto

  Removed files:
    trunk/ext/psych/lib/psych/json.rb
  Modified files:
    trunk/ChangeLog
    trunk/ext/psych/lib/psych.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33808)
+++ ChangeLog	(revision 33809)
@@ -1,3 +1,8 @@
+Tue Nov 22 04:46:22 2011  Aaron Patterson <aaron@t...>
+
+	* 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@f...>
 
 	* test/ruby/test_io.rb (test_fcntl_dupfd): the argument of F_DUPFD is
Index: ext/psych/lib/psych/json.rb
===================================================================
--- ext/psych/lib/psych/json.rb	(revision 33808)
+++ ext/psych/lib/psych/json.rb	(revision 33809)
@@ -1,6 +0,0 @@
-module Psych
-  module JSON
-    autoload :TreeBuilder, 'psych/json/tree_builder'
-    autoload :Stream, 'psych/json/stream'
-  end
-end
Index: ext/psych/lib/psych.rb
===================================================================
--- ext/psych/lib/psych.rb	(revision 33808)
+++ ext/psych/lib/psych.rb	(revision 33809)
@@ -10,7 +10,9 @@
 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 @@
   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.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/