lib/active_support/dependencies.rb in activesupport-5.0.0.beta2 vs lib/active_support/dependencies.rb in activesupport-5.0.0.beta3

@@ -143,13 +143,13 @@
           next unless mod.is_a?(Module)
 
           # Get a list of the constants that were added
           new_constants = mod.local_constants - original_constants
 
-          # self[namespace] returns an Array of the constants that are being evaluated
+          # @stack[namespace] returns an Array of the constants that are being evaluated
           # for that namespace. For instance, if parent.rb requires child.rb, the first
-          # element of self[Object] will be an Array of the constants that were present
+          # element of @stack[Object] will be an Array of the constants that were present
           # before parent.rb was required. The second element will be an Array of the
           # constants that were present before child.rb was required.
           @stack[namespace].each do |namespace_constants|
             namespace_constants.concat(new_constants)
           end
@@ -260,10 +260,10 @@
 
         Dependencies.depend_on(file_name, message)
       end
 
       def load_dependency(file)
-        if Dependencies.load? && ActiveSupport::Dependencies.constant_watch_stack.watching?
+        if Dependencies.load? && Dependencies.constant_watch_stack.watching?
           Dependencies.new_constants_in(Object) { yield }
         else
           yield
         end
       rescue Exception => exception  # errors from loading file