From e6eb941d1bd192e1fc6f5c17cbe1944d534ca67a Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 22 Apr 2009 00:33:00 -0700
Subject: [PATCH] Switch last module core extension to class reopen

---
 .../lib/active_support/core_ext/module.rb          | 13 -------------
 .../active_support/core_ext/module/model_naming.rb | 14 ++++++--------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb
index c37c9badcac3c..fee91534e73a6 100644
--- a/activesupport/lib/active_support/core_ext/module.rb
+++ b/activesupport/lib/active_support/core_ext/module.rb
@@ -10,16 +10,3 @@
 require 'active_support/core_ext/module/model_naming'
 require 'active_support/core_ext/module/synchronization'
 require 'active_support/core_ext/module/setup'
-
-module ActiveSupport
-  module CoreExtensions
-    # Various extensions for the Ruby core Module class.
-    module Module
-      # Nothing here. Only defined for API documentation purposes.
-    end
-  end
-end
-
-class Module
-  include ActiveSupport::CoreExtensions::Module
-end
diff --git a/activesupport/lib/active_support/core_ext/module/model_naming.rb b/activesupport/lib/active_support/core_ext/module/model_naming.rb
index 3ec4f3ba11401..004b96a3c1ed2 100644
--- a/activesupport/lib/active_support/core_ext/module/model_naming.rb
+++ b/activesupport/lib/active_support/core_ext/module/model_naming.rb
@@ -10,14 +10,12 @@ def initialize(name)
       @partial_path = "#{@cache_key}/#{demodulize.underscore}".freeze
     end
   end
+end
 
-  module CoreExtensions
-    module Module
-      # Returns an ActiveSupport::ModelName object for module. It can be
-      # used to retrieve all kinds of naming-related information.
-      def model_name
-        @model_name ||= ModelName.new(name)
-      end
-    end
+class Module
+  # Returns an ActiveSupport::ModelName object for module. It can be
+  # used to retrieve all kinds of naming-related information.
+  def model_name
+    @model_name ||= ActiveSupport::ModelName.new(name)
   end
 end