* 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
This commit is contained in:
parent
9632e413a7
commit
bf7cc652ae
@ -1,3 +1,8 @@
|
|||||||
|
Thu Jul 14 12:48:47 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/json/**/*.rb: merge original files from upstream repository.
|
||||||
|
It only fixes styles of frozen string literal.
|
||||||
|
|
||||||
Wed Jul 13 22:23:03 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
Wed Jul 13 22:23:03 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||||
|
|
||||||
* test/json/json_common_interface_test.rb: use assert_raise instead of
|
* test/json/json_common_interface_test.rb: use assert_raise instead of
|
||||||
|
@ -1,4 +1,2 @@
|
|||||||
# frozen_string_literal: false
|
|
||||||
require 'mkmf'
|
require 'mkmf'
|
||||||
create_makefile('json')
|
create_makefile('json')
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
# frozen_string_literal: false
|
|
||||||
require 'mkmf'
|
require 'mkmf'
|
||||||
|
|
||||||
$defs << "-DJSON_GENERATOR"
|
$defs << "-DJSON_GENERATOR"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
require 'json/common'
|
require 'json/common'
|
||||||
|
|
||||||
##
|
##
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
# This file requires the implementations of ruby core's custom objects for
|
# This file requires the implementations of ruby core's custom objects for
|
||||||
# serialisation/deserialisation.
|
# serialisation/deserialisation.
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
require 'json/version'
|
require 'json/version'
|
||||||
require 'json/generic_object'
|
require 'json/generic_object'
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
# frozen_string_literal: false
|
|
||||||
require 'json/common'
|
require 'json/common'
|
||||||
|
|
||||||
module JSON
|
module JSON
|
||||||
|
@ -1 +0,0 @@
|
|||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
# frozen_string_literal: false
|
#frozen_string_literal: false
|
||||||
require 'ostruct'
|
require 'ostruct'
|
||||||
|
|
||||||
module JSON
|
module JSON
|
||||||
|
Loading…
x
Reference in New Issue
Block a user