summaryrefslogtreecommitdiff
path: root/ext/json/lib
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-12-22 21:51:15 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-12-22 21:51:15 +0900
commit034c19ce288b951cfaf3bbd996ce19e14fdeb502 (patch)
treeaef4115453fce86ed80d5b13f5d5cdcf8e747547 /ext/json/lib
parent9b9cbbbc17bb5840581c7da37fd0feb0a7d4c1f3 (diff)
Merge json-2.5.1
Diffstat (limited to 'ext/json/lib')
-rw-r--r--ext/json/lib/json/common.rb2
-rw-r--r--ext/json/lib/json/version.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 3e390f2d6b6..ea46896fccc 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -72,6 +72,8 @@ module JSON
self.state = generator::State
const_set :State, self.state
const_set :SAFE_STATE_PROTOTYPE, State.new # for JRuby
+ const_set :FAST_STATE_PROTOTYPE, create_fast_state
+ const_set :PRETTY_STATE_PROTOTYPE, create_pretty_state
ensure
$VERBOSE = old
end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 2a0a6e8e555..7a72272bd0d 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
module JSON
# JSON version
- VERSION = '2.5.0'
+ VERSION = '2.5.1'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: