From a3600fc3771818028f591969c2d3287fcecfa13c Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 10 Aug 2016 16:30:43 +0000 Subject: 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 --- 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 f034bdd448..44563a2fd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 11 01:30:29 2016 Marcus Stollsteimer + + * 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 * 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 20f0e8dc77..b58af76e10 100644 --- a/ext/json/lib/json/add/date.rb +++ b/ext/json/lib/json/add/date.rb @@ -4,7 +4,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 757d43c266..f794eb3d7d 100644 --- a/ext/json/lib/json/add/date_time.rb +++ b/ext/json/lib/json/add/date_time.rb @@ -4,7 +4,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 95379d97f5..caac713c6a 100644 --- a/ext/json/lib/json/add/exception.rb +++ b/ext/json/lib/json/add/exception.rb @@ -3,7 +3,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 2fa1e88b93..1f9ce7b3b4 100644 --- a/ext/json/lib/json/add/ostruct.rb +++ b/ext/json/lib/json/add/ostruct.rb @@ -4,7 +4,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 4dd7ccf0eb..3ef20150bf 100644 --- a/ext/json/lib/json/add/range.rb +++ b/ext/json/lib/json/add/range.rb @@ -3,7 +3,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 4bea64fb19..41b260f307 100644 --- a/ext/json/lib/json/add/regexp.rb +++ b/ext/json/lib/json/add/regexp.rb @@ -3,7 +3,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 c9afe70770..d08d88237a 100644 --- a/ext/json/lib/json/add/struct.rb +++ b/ext/json/lib/json/add/struct.rb @@ -3,7 +3,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 831e5c6173..31b56a294f 100644 --- a/ext/json/lib/json/add/symbol.rb +++ b/ext/json/lib/json/add/symbol.rb @@ -3,7 +3,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 18e57d7555..80b6434f17 100644 --- a/ext/json/lib/json/add/time.rb +++ b/ext/json/lib/json/add/time.rb @@ -3,7 +3,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 a8ee5b298f..bcd0f51145 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.2" #define RUBY_RELEASE_DATE "2016-08-11" -#define RUBY_PATCHLEVEL 145 +#define RUBY_PATCHLEVEL 146 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8 -- cgit v1.2.3