[前][次][番号順一覧][スレッド一覧]

ruby-changes:43855

From: usa <ko1@a...>
Date: Tue, 16 Aug 2016 14:07:33 +0900 (JST)
Subject: [ruby-changes:43855] usa:r55928 (ruby_2_2): merge revision(s) 55380: [Backport #12255]

usa	2016-08-16 14:07:27 +0900 (Tue, 16 Aug 2016)

  New Revision: 55928

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55928

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/json/lib/json/add/date.rb
    branches/ruby_2_2/ext/json/lib/json/add/date_time.rb
    branches/ruby_2_2/ext/json/lib/json/add/exception.rb
    branches/ruby_2_2/ext/json/lib/json/add/ostruct.rb
    branches/ruby_2_2/ext/json/lib/json/add/range.rb
    branches/ruby_2_2/ext/json/lib/json/add/regexp.rb
    branches/ruby_2_2/ext/json/lib/json/add/struct.rb
    branches/ruby_2_2/ext/json/lib/json/add/symbol.rb
    branches/ruby_2_2/ext/json/lib/json/add/time.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55927)
+++ ruby_2_2/ChangeLog	(revision 55928)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Aug 16 14:07:18 2016  Marcus Stollsteimer  <sto.mar@w...>
+
+	* 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  <naruse@r...>
 
 	* pack.c (pack_pack): use union instead of bare variable to ease
Index: ruby_2_2/ext/json/lib/json/add/regexp.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/regexp.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/regexp.rb	(revision 55928)
@@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/regexp.rb#L2
   require 'json'
 end
 
-# Regexp serialization/deserialization
 class Regexp
 
   # Deserializes JSON string by constructing new Regexp object with source
Index: ruby_2_2/ext/json/lib/json/add/date_time.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/date_time.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/date_time.rb	(revision 55928)
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/date_time.rb#L3
 end
 require 'date'
 
-# DateTime serialization/deserialization
 class DateTime
 
   # Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
Index: ruby_2_2/ext/json/lib/json/add/range.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/range.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/range.rb	(revision 55928)
@@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/range.rb#L2
   require 'json'
 end
 
-# Range serialization/deserialization
 class Range
 
   # Deserializes JSON string by constructing new Range object with arguments
Index: ruby_2_2/ext/json/lib/json/add/date.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/date.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/date.rb	(revision 55928)
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/date.rb#L3
 end
 require 'date'
 
-# Date serialization/deserialization
 class Date
 
   # Deserializes JSON string by converting Julian year <tt>y</tt>, month
Index: ruby_2_2/ext/json/lib/json/add/exception.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/exception.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/exception.rb	(revision 55928)
@@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/exception.rb#L2
   require 'json'
 end
 
-# Exception serialization/deserialization
 class Exception
 
   # Deserializes JSON string by constructing new Exception object with message
Index: ruby_2_2/ext/json/lib/json/add/time.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/time.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/time.rb	(revision 55928)
@@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/time.rb#L2
   require 'json'
 end
 
-# Time serialization/deserialization
 class Time
 
   # Deserializes JSON string by converting time since epoch to Time
Index: ruby_2_2/ext/json/lib/json/add/ostruct.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/ostruct.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/ostruct.rb	(revision 55928)
@@ -3,7 +3,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/ostruct.rb#L3
 end
 require 'ostruct'
 
-# OpenStruct serialization/deserialization
 class OpenStruct
 
   # Deserializes JSON string by constructing new Struct object with values
Index: ruby_2_2/ext/json/lib/json/add/struct.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/struct.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/struct.rb	(revision 55928)
@@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/struct.rb#L2
   require 'json'
 end
 
-# Struct serialization/deserialization
 class Struct
 
   # Deserializes JSON string by constructing new Struct object with values
Index: ruby_2_2/ext/json/lib/json/add/symbol.rb
===================================================================
--- ruby_2_2/ext/json/lib/json/add/symbol.rb	(revision 55927)
+++ ruby_2_2/ext/json/lib/json/add/symbol.rb	(revision 55928)
@@ -2,7 +2,6 @@ unless defined?(::JSON::JSON_LOADED) and https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/json/lib/json/add/symbol.rb#L2
   require 'json'
 end
 
-# Symbol serialization/deserialization
 class Symbol
   # Returns a hash, that will be turned into a JSON object and represent this
   # object.
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55927)
+++ ruby_2_2/version.h	(revision 55928)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55380


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]