All AMo modules are safe to defer

2 files changed, 20 insertions, 23 deletions

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index 46caa53219..e0de27b96d 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -29,33 +29,29 @@ require 'active_support'
 module ActiveModel
   extend ActiveSupport::Autoload
 
-  eager_autoload do
-    autoload :AttributeMethods
-    autoload :Conversion
-    autoload :DeprecatedErrorMethods
-    autoload :Dirty
-    autoload :Errors
-    autoload :Lint
-    autoload :Name,         'active_model/naming'
-    autoload :Naming
-    autoload :Observer,     'active_model/observing'
-    autoload :Observing
-    autoload :Serialization
-    autoload :StateMachine
-    autoload :Translation
-    autoload :Validations
-    autoload :ValidationsRepairHelper
-    autoload :Validator
-    autoload :VERSION
-  end
+  autoload :AttributeMethods
+  autoload :Conversion
+  autoload :DeprecatedErrorMethods
+  autoload :Dirty
+  autoload :Errors
+  autoload :Lint
+  autoload :Name,         'active_model/naming'
+  autoload :Naming
+  autoload :Observer,     'active_model/observing'
+  autoload :Observing
+  autoload :Serialization
+  autoload :StateMachine
+  autoload :Translation
+  autoload :Validations
+  autoload :ValidationsRepairHelper
+  autoload :Validator
+  autoload :VERSION
 
   module Serializers
     extend ActiveSupport::Autoload
 
-    eager_autoload do
-      autoload :JSON
-      autoload :Xml
-    end
+    autoload :JSON
+    autoload :Xml
   end
 end
 
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 064ec98f3a..a0d64507f9 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/keys'
+require 'active_model/errors'
 
 module ActiveModel
   module Validations