From 643ef23752d13e9d4976f3c7fc64f36a15a459c2 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 16 Aug 2016 05:07:27 +0000 Subject: [PATCH] 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_2@55928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/json/lib/json/add/date.rb | 1 - ext/json/lib/json/add/date_time.rb | 1 - ext/json/lib/json/add/exception.rb | 1 - ext/json/lib/json/add/ostruct.rb | 1 - ext/json/lib/json/add/range.rb | 1 - ext/json/lib/json/add/regexp.rb | 1 - ext/json/lib/json/add/struct.rb | 1 - ext/json/lib/json/add/symbol.rb | 1 - ext/json/lib/json/add/time.rb | 1 - version.h | 2 +- 11 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5af26cb12..c7cb440c8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 16 14:07:18 2016 Marcus Stollsteimer + + * ext/json/lib/*.rb: Removed some comments. Because these are unnecessary + class description. [ci skip][Bug #12255][ruby-core:74835] + Tue Aug 16 14:06:04 2016 NARUSE, Yui * pack.c (pack_pack): use union instead of bare variable to ease diff --git a/ext/json/lib/json/add/date.rb b/ext/json/lib/json/add/date.rb index 4288237db1..458d9eba96 100644 --- a/ext/json/lib/json/add/date.rb +++ b/ext/json/lib/json/add/date.rb @@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED end require 'date' -# Date serialization/deserialization class Date # Deserializes JSON string by converting Julian year y, month diff --git a/ext/json/lib/json/add/date_time.rb b/ext/json/lib/json/add/date_time.rb index 5ea42ea656..a1009cf5dc 100644 --- a/ext/json/lib/json/add/date_time.rb +++ b/ext/json/lib/json/add/date_time.rb @@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED end require 'date' -# DateTime serialization/deserialization class DateTime # Deserializes JSON string by converting year y, month m, diff --git a/ext/json/lib/json/add/exception.rb b/ext/json/lib/json/add/exception.rb index e6ad257abf..f4b150d236 100644 --- a/ext/json/lib/json/add/exception.rb +++ b/ext/json/lib/json/add/exception.rb @@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end -# Exception serialization/deserialization class Exception # Deserializes JSON string by constructing new Exception object with message diff --git a/ext/json/lib/json/add/ostruct.rb b/ext/json/lib/json/add/ostruct.rb index da81e107a7..a62f92f59b 100644 --- a/ext/json/lib/json/add/ostruct.rb +++ b/ext/json/lib/json/add/ostruct.rb @@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED end require 'ostruct' -# OpenStruct serialization/deserialization class OpenStruct # Deserializes JSON string by constructing new Struct object with values diff --git a/ext/json/lib/json/add/range.rb b/ext/json/lib/json/add/range.rb index e61e553cdb..0df382c60a 100644 --- a/ext/json/lib/json/add/range.rb +++ b/ext/json/lib/json/add/range.rb @@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end -# Range serialization/deserialization class Range # Deserializes JSON string by constructing new Range object with arguments diff --git a/ext/json/lib/json/add/regexp.rb b/ext/json/lib/json/add/regexp.rb index 2fcbb6fb14..9adf06c8f6 100644 --- a/ext/json/lib/json/add/regexp.rb +++ b/ext/json/lib/json/add/regexp.rb @@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end -# Regexp serialization/deserialization class Regexp # Deserializes JSON string by constructing new Regexp object with source diff --git a/ext/json/lib/json/add/struct.rb b/ext/json/lib/json/add/struct.rb index 6847cde99b..e1e24800d0 100644 --- a/ext/json/lib/json/add/struct.rb +++ b/ext/json/lib/json/add/struct.rb @@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end -# Struct serialization/deserialization class Struct # Deserializes JSON string by constructing new Struct object with values diff --git a/ext/json/lib/json/add/symbol.rb b/ext/json/lib/json/add/symbol.rb index 03dc9a56a5..6df77cab09 100644 --- a/ext/json/lib/json/add/symbol.rb +++ b/ext/json/lib/json/add/symbol.rb @@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end -# Symbol serialization/deserialization class Symbol # Returns a hash, that will be turned into a JSON object and represent this # object. diff --git a/ext/json/lib/json/add/time.rb b/ext/json/lib/json/add/time.rb index 338209d899..25cec9fe91 100644 --- a/ext/json/lib/json/add/time.rb +++ b/ext/json/lib/json/add/time.rb @@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end -# Time serialization/deserialization class Time # Deserializes JSON string by converting time since epoch to Time diff --git a/version.h b/version.h index 1585143802..de5ced1b41 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-08-16" -#define RUBY_PATCHLEVEL 356 +#define RUBY_PATCHLEVEL 357 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8