mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 55380: [Backport #12255]
* ext/json/lib/*.rb: Removed some comments. Because these are unnecessary class description. [ci skip][Bug #12255][ruby-core:74835] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ada634ac0f
commit
a3600fc377
11 changed files with 6 additions and 10 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Thu Aug 11 01:30:29 2016 Marcus Stollsteimer <sto.mar@web.de>
|
||||||
|
|
||||||
|
* ext/json/lib/*.rb: Removed some comments. Because these are unnecessary
|
||||||
|
class description. [ci skip][Bug #12255][ruby-core:74835]
|
||||||
|
|
||||||
Thu Aug 11 01:09:43 2016 NARUSE, Yui <naruse@ruby-lang.org>
|
Thu Aug 11 01:09:43 2016 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* pack.c (pack_pack): use union instead of bare variable to ease
|
* pack.c (pack_pack): use union instead of bare variable to ease
|
||||||
|
|
|
@ -4,7 +4,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
end
|
end
|
||||||
require 'date'
|
require 'date'
|
||||||
|
|
||||||
# Date serialization/deserialization
|
|
||||||
class Date
|
class Date
|
||||||
|
|
||||||
# Deserializes JSON string by converting Julian year <tt>y</tt>, month
|
# Deserializes JSON string by converting Julian year <tt>y</tt>, month
|
||||||
|
|
|
@ -4,7 +4,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
end
|
end
|
||||||
require 'date'
|
require 'date'
|
||||||
|
|
||||||
# DateTime serialization/deserialization
|
|
||||||
class DateTime
|
class DateTime
|
||||||
|
|
||||||
# Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
|
# Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
|
||||||
|
|
|
@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
|
||||||
# Exception serialization/deserialization
|
|
||||||
class Exception
|
class Exception
|
||||||
|
|
||||||
# Deserializes JSON string by constructing new Exception object with message
|
# Deserializes JSON string by constructing new Exception object with message
|
||||||
|
|
|
@ -4,7 +4,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
end
|
end
|
||||||
require 'ostruct'
|
require 'ostruct'
|
||||||
|
|
||||||
# OpenStruct serialization/deserialization
|
|
||||||
class OpenStruct
|
class OpenStruct
|
||||||
|
|
||||||
# Deserializes JSON string by constructing new Struct object with values
|
# Deserializes JSON string by constructing new Struct object with values
|
||||||
|
|
|
@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
|
||||||
# Range serialization/deserialization
|
|
||||||
class Range
|
class Range
|
||||||
|
|
||||||
# Deserializes JSON string by constructing new Range object with arguments
|
# Deserializes JSON string by constructing new Range object with arguments
|
||||||
|
|
|
@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
|
||||||
# Regexp serialization/deserialization
|
|
||||||
class Regexp
|
class Regexp
|
||||||
|
|
||||||
# Deserializes JSON string by constructing new Regexp object with source
|
# Deserializes JSON string by constructing new Regexp object with source
|
||||||
|
|
|
@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
|
||||||
# Struct serialization/deserialization
|
|
||||||
class Struct
|
class Struct
|
||||||
|
|
||||||
# Deserializes JSON string by constructing new Struct object with values
|
# Deserializes JSON string by constructing new Struct object with values
|
||||||
|
|
|
@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
|
||||||
# Symbol serialization/deserialization
|
|
||||||
class Symbol
|
class Symbol
|
||||||
# Returns a hash, that will be turned into a JSON object and represent this
|
# Returns a hash, that will be turned into a JSON object and represent this
|
||||||
# object.
|
# object.
|
||||||
|
|
|
@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
|
||||||
require 'json'
|
require 'json'
|
||||||
end
|
end
|
||||||
|
|
||||||
# Time serialization/deserialization
|
|
||||||
class Time
|
class Time
|
||||||
|
|
||||||
# Deserializes JSON string by converting time since epoch to Time
|
# Deserializes JSON string by converting time since epoch to Time
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#define RUBY_VERSION "2.3.2"
|
#define RUBY_VERSION "2.3.2"
|
||||||
#define RUBY_RELEASE_DATE "2016-08-11"
|
#define RUBY_RELEASE_DATE "2016-08-11"
|
||||||
#define RUBY_PATCHLEVEL 145
|
#define RUBY_PATCHLEVEL 146
|
||||||
|
|
||||||
#define RUBY_RELEASE_YEAR 2016
|
#define RUBY_RELEASE_YEAR 2016
|
||||||
#define RUBY_RELEASE_MONTH 8
|
#define RUBY_RELEASE_MONTH 8
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue