Merge json-2.5.1
This commit is contained in:
parent
9b9cbbbc17
commit
034c19ce28
@ -1 +1 @@
|
|||||||
2.5.0
|
2.5.1
|
||||||
|
@ -72,6 +72,8 @@ module JSON
|
|||||||
self.state = generator::State
|
self.state = generator::State
|
||||||
const_set :State, self.state
|
const_set :State, self.state
|
||||||
const_set :SAFE_STATE_PROTOTYPE, State.new # for JRuby
|
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
|
ensure
|
||||||
$VERBOSE = old
|
$VERBOSE = old
|
||||||
end
|
end
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# frozen_string_literal: false
|
# frozen_string_literal: false
|
||||||
module JSON
|
module JSON
|
||||||
# JSON version
|
# JSON version
|
||||||
VERSION = '2.5.0'
|
VERSION = '2.5.1'
|
||||||
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
|
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
|
||||||
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
|
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
|
||||||
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
|
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user