ruby-changes:64461
From: Hiroshi <ko1@a...>
Date: Tue, 22 Dec 2020 21:51:28 +0900 (JST)
Subject: [ruby-changes:64461] 034c19ce28 (master): Merge json-2.5.1
https://git.ruby-lang.org/ruby.git/commit/?id=034c19ce28 From 034c19ce288b951cfaf3bbd996ce19e14fdeb502 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Tue, 22 Dec 2020 21:51:15 +0900 Subject: Merge json-2.5.1 diff --git a/ext/json/VERSION b/ext/json/VERSION index 437459c..73462a5 100644 --- a/ext/json/VERSION +++ b/ext/json/VERSION @@ -1 +1 @@ -2.5.0 +2.5.1 diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb index 3e390f2..ea46896 100644 --- a/ext/json/lib/json/common.rb +++ b/ext/json/lib/json/common.rb @@ -72,6 +72,8 @@ module JSON https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/common.rb#L72 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 2a0a6e8..7a72272 100644 --- a/ext/json/lib/json/version.rb +++ b/ext/json/lib/json/version.rb @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/version.rb#L1 # 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: -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/