Revert "Deprecate rubygems/fast.rb" - prep for merge with evans branch

This reverts commit 93ac03a.
rubygems · Nov 13, 2010 · 90bc7a3 · 90bc7a3
1 parent 6398437
commit 90bc7a3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
@@ -1051,6 +1051,10 @@ class << self
 
     alias cache source_index # an alias for the old name
 
+    # Internal helper to inform us if we were fastloaded, so plugins.rb should
+    # or should not load plugins.
+    attr_reader :fast
+
     # :startdoc:
 
   end
@@ -1164,3 +1168,6 @@ def self.datadir(package_name)
 require 'rubygems/custom_require' if gem_disabled or RUBY_VERSION < '1.9'
 
 Gem.clear_paths
+
+require 'rubygems/plugins' unless Gem.fast
+
diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb
@@ -179,5 +179,3 @@ def load_and_instantiate(command_name)
 
 end
 
-# Load rubygems plugins after the command manager is loaded.
-require 'rubygems/plugins'
diff --git a/lib/rubygems/fast.rb b/lib/rubygems/fast.rb
@@ -0,0 +1,5 @@
+module Gem
+  @fast = true
+end
+
+require 'rubygems'