From bf7cc652ae0fc0c3d9683c3a762669c2d28737a4 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 14 Jul 2016 03:48:54 +0000
Subject: * ext/json/**/*.rb: merge original files from upstream repository.  
 It only fixes styles of frozen string literal.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/json/lib/json.rb                | 2 +-
 ext/json/lib/json/add/bigdecimal.rb | 2 +-
 ext/json/lib/json/add/complex.rb    | 2 +-
 ext/json/lib/json/add/core.rb       | 2 +-
 ext/json/lib/json/add/date.rb       | 2 +-
 ext/json/lib/json/add/date_time.rb  | 2 +-
 ext/json/lib/json/add/exception.rb  | 2 +-
 ext/json/lib/json/add/ostruct.rb    | 2 +-
 ext/json/lib/json/add/range.rb      | 2 +-
 ext/json/lib/json/add/rational.rb   | 2 +-
 ext/json/lib/json/add/regexp.rb     | 2 +-
 ext/json/lib/json/add/struct.rb     | 2 +-
 ext/json/lib/json/add/symbol.rb     | 2 +-
 ext/json/lib/json/add/time.rb       | 2 +-
 ext/json/lib/json/common.rb         | 2 +-
 ext/json/lib/json/ext.rb            | 1 -
 ext/json/lib/json/ext/.keep         | 1 -
 ext/json/lib/json/generic_object.rb | 2 +-
 18 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'ext/json/lib')

diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
index 61bb8fae0e..b5a6912415 100644
--- a/ext/json/lib/json.rb
+++ b/ext/json/lib/json.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'json/common'
 
 ##
diff --git a/ext/json/lib/json/add/bigdecimal.rb b/ext/json/lib/json/add/bigdecimal.rb
index a7646860a2..539daeeaf5 100644
--- a/ext/json/lib/json/add/bigdecimal.rb
+++ b/ext/json/lib/json/add/bigdecimal.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/complex.rb b/ext/json/lib/json/add/complex.rb
index 65d388b48a..28ef734daf 100644
--- a/ext/json/lib/json/add/complex.rb
+++ b/ext/json/lib/json/add/complex.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
index 93b2bff424..bfb017c460 100644
--- a/ext/json/lib/json/add/core.rb
+++ b/ext/json/lib/json/add/core.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 # This file requires the implementations of ruby core's custom objects for
 # serialisation/deserialisation.
 
diff --git a/ext/json/lib/json/add/date.rb b/ext/json/lib/json/add/date.rb
index b58af76e10..25523561a5 100644
--- a/ext/json/lib/json/add/date.rb
+++ b/ext/json/lib/json/add/date.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/date_time.rb b/ext/json/lib/json/add/date_time.rb
index f794eb3d7d..38b0e86ab8 100644
--- a/ext/json/lib/json/add/date_time.rb
+++ b/ext/json/lib/json/add/date_time.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/exception.rb b/ext/json/lib/json/add/exception.rb
index caac713c6a..a107e5b3c4 100644
--- a/ext/json/lib/json/add/exception.rb
+++ b/ext/json/lib/json/add/exception.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/ostruct.rb b/ext/json/lib/json/add/ostruct.rb
index 1f9ce7b3b4..7c13910052 100644
--- a/ext/json/lib/json/add/ostruct.rb
+++ b/ext/json/lib/json/add/ostruct.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/range.rb b/ext/json/lib/json/add/range.rb
index 3ef20150bf..93529fb1c4 100644
--- a/ext/json/lib/json/add/range.rb
+++ b/ext/json/lib/json/add/range.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/rational.rb b/ext/json/lib/json/add/rational.rb
index e83a532775..356940b225 100644
--- a/ext/json/lib/json/add/rational.rb
+++ b/ext/json/lib/json/add/rational.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/regexp.rb b/ext/json/lib/json/add/regexp.rb
index 41b260f307..a93866b05a 100644
--- a/ext/json/lib/json/add/regexp.rb
+++ b/ext/json/lib/json/add/regexp.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/struct.rb b/ext/json/lib/json/add/struct.rb
index d08d88237a..e8395ed42f 100644
--- a/ext/json/lib/json/add/struct.rb
+++ b/ext/json/lib/json/add/struct.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/symbol.rb b/ext/json/lib/json/add/symbol.rb
index 31b56a294f..74b13a423f 100644
--- a/ext/json/lib/json/add/symbol.rb
+++ b/ext/json/lib/json/add/symbol.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/time.rb b/ext/json/lib/json/add/time.rb
index 80b6434f17..b73acc4086 100644
--- a/ext/json/lib/json/add/time.rb
+++ b/ext/json/lib/json/add/time.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index a0221fe94b..7cc852916c 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'json/version'
 require 'json/generic_object'
 
diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb
index 43b8519b34..7264a857fa 100644
--- a/ext/json/lib/json/ext.rb
+++ b/ext/json/lib/json/ext.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'json/common'
 
 module JSON
diff --git a/ext/json/lib/json/ext/.keep b/ext/json/lib/json/ext/.keep
index 8b13789179..e69de29bb2 100644
--- a/ext/json/lib/json/ext/.keep
+++ b/ext/json/lib/json/ext/.keep
@@ -1 +0,0 @@
-
diff --git a/ext/json/lib/json/generic_object.rb b/ext/json/lib/json/generic_object.rb
index 8d72d90092..108309db26 100644
--- a/ext/json/lib/json/generic_object.rb
+++ b/ext/json/lib/json/generic_object.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'ostruct'
 
 module JSON
-- 
cgit v1.2.3