lib/active_support/dependencies.rb in activesupport-5.2.0.beta2 vs lib/active_support/dependencies.rb in activesupport-5.2.0.rc1

@@ -445,10 +445,11 @@
     def autoload_module!(into, const_name, qualified_name, path_suffix)
       return nil unless base_path = autoloadable_module?(path_suffix)
       mod = Module.new
       into.const_set const_name, mod
       autoloaded_constants << qualified_name unless autoload_once_paths.include?(base_path)
+      autoloaded_constants.uniq!
       mod
     end
 
     # Load the file at the provided path. +const_paths+ is a set of qualified
     # constant names. When loading the file, Dependencies will watch for the
@@ -668,10 +669,10 @@
       when String then desc.sub(/^::/, "")
       when Symbol then desc.to_s
       when Module
         desc.name ||
           raise(ArgumentError, "Anonymous modules have no name to be referenced by")
-        else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
+      else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
       end
     end
 
     def remove_constant(const) #:nodoc:
       # Normalize ::Foo, ::Object::Foo, Object::Foo, Object::Object::Foo, etc. as Foo.