1 files changed, 1 insertions, 35 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index dc10f78104..d1543c4c58 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -5,7 +5,6 @@ require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/anonymous'
-require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/load_error'
 require 'active_support/core_ext/name_error'
@@ -474,7 +473,7 @@ module ActiveSupport #:nodoc:
         raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
       end
 
-      raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name)
+      raise NameError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name)
 
       qualified_name = qualified_name_for from_mod, const_name
       path_suffix = qualified_name.underscore
@@ -550,23 +549,6 @@ module ActiveSupport #:nodoc:
       end
       alias :get :[]
 
-      class Getter # :nodoc:
-        def initialize(name)
-          @name = name
-        end
-
-        def get
-          Reference.get @name
-        end
-        deprecate :get
-      end
-
-      def new(name)
-        self[name] = name
-        Getter.new(name)
-      end
-      deprecate :new
-
       def store(name)
         self[name] = name
         self
@@ -579,11 +561,6 @@ module ActiveSupport #:nodoc:
 
     Reference = ClassCache.new
 
-    def ref(name)
-      Reference.new(name)
-    end
-    deprecate :ref
-
     # Store a reference to a class +klass+.
     def reference(klass)
       Reference.store klass
@@ -651,17 +628,6 @@ module ActiveSupport #:nodoc:
       return []
     end
 
-    class LoadingModule #:nodoc:
-      # Old style environment.rb referenced this method directly.  Please note, it doesn't
-      # actually *do* anything any more.
-      def self.root(*args)
-        if defined?(Rails) && Rails.logger
-          Rails.logger.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
-          Rails.logger.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
-        end
-      end
-    end
-
     # Convert the provided const desc to a qualified constant name (as a string).
     # A module, class, symbol, or string may be provided.
     def to_constant_name(desc) #:nodoc: