Merge commit 'mainstream/master'

1 files changed, 0 insertions, 29 deletions

diff --git a/activesupport/lib/active_support/json.rb b/activesupport/lib/active_support/json.rb
index 914cf4f8fe..bbda2c9fa3 100644
--- a/activesupport/lib/active_support/json.rb
+++ b/activesupport/lib/active_support/json.rb
@@ -1,5 +1,3 @@
-
-
 module ActiveSupport
   # If true, use ISO 8601 format for dates and times.  Otherwise, fall back to the ActiveSupport legacy format.
   mattr_accessor :use_standard_json_time_format
@@ -19,33 +17,6 @@ module ActiveSupport
       @escape_html_entities_in_json = value
     end
   end
-
-  module JSON
-    RESERVED_WORDS = %w(
-      abstract      delete        goto          private       transient
-      boolean       do            if            protected     try
-      break         double        implements    public        typeof
-      byte          else          import        return        var
-      case          enum          in            short         void
-      catch         export        instanceof    static        volatile
-      char          extends       int           super         while
-      class         final         interface     switch        with
-      const         finally       long          synchronized
-      continue      float         native        this
-      debugger      for           new           throw
-      default       function      package       throws
-    ) #:nodoc:
-
-    class << self
-      def valid_identifier?(key) #:nodoc:
-        key.to_s =~ /^[[:alpha:]_$][[:alnum:]_$]*$/ && !reserved_word?(key)
-      end
-
-      def reserved_word?(key) #:nodoc:
-        RESERVED_WORDS.include?(key.to_s)
-      end
-    end
-  end
 end
 
 require 'active_support/json/encoding'