From 53f013f4e17e4ae0df07f26c66beadc6414305cf Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 12 Mar 2017 15:51:23 +0000 Subject: merge revision(s) 57735: [Backport #13148] Fix doc for Hash#dig and Struct#dig * hash.c (rb_hash_dig): [DOC] correct argument name in method description; fix formatting in examples. * struct.c (rb_struct_dig): ditto. [ruby-core:79221] [Bug #13148] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 12 ++++++------ struct.c | 6 +++--- version.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hash.c b/hash.c index 7c844da965..c90814b2ee 100644 --- a/hash.c +++ b/hash.c @@ -2874,19 +2874,19 @@ rb_hash_any_p(VALUE hash) * call-seq: * hsh.dig(key, ...) -> object * - * Extracts the nested value specified by the sequence of idx + * Extracts the nested value specified by the sequence of key * objects by calling +dig+ at each step, returning +nil+ if any * intermediate step is +nil+. * * h = { foo: {bar: {baz: 1}}} * - * h.dig(:foo, :bar, :baz) #=> 1 - * h.dig(:foo, :zot, :xyz) #=> nil + * h.dig(:foo, :bar, :baz) #=> 1 + * h.dig(:foo, :zot, :xyz) #=> nil * * g = { foo: [10, 11, 12] } - * g.dig(:foo, 1) #=> 11 - * g.dig(:foo, 1, 0) #=> TypeError: Integer does not have #dig method - * g.dig(:foo, :bar) #=> TypeError: no implicit conversion of Symbol into Integer + * g.dig(:foo, 1) #=> 11 + * g.dig(:foo, 1, 0) #=> TypeError: Integer does not have #dig method + * g.dig(:foo, :bar) #=> TypeError: no implicit conversion of Symbol into Integer */ VALUE diff --git a/struct.c b/struct.c index 6303436122..9289338a16 100644 --- a/struct.c +++ b/struct.c @@ -1136,15 +1136,15 @@ rb_struct_ptr(VALUE s) * call-seq: * struct.dig(key, ...) -> object * - * Extracts the nested value specified by the sequence of idx + * Extracts the nested value specified by the sequence of +key+ * objects by calling +dig+ at each step, returning +nil+ if any * intermediate step is +nil+. * * klass = Struct.new(:a) * o = klass.new(klass.new({b: [1, 2, 3]})) * - * o.dig(:a, :a, :b, 0) #=> 1 - * o.dig(:b, 0) #=> nil + * o.dig(:a, :a, :b, 0) #=> 1 + * o.dig(:b, 0) #=> nil */ static VALUE diff --git a/version.h b/version.h index 88a4e8669f..a4e8f09301 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE "2017-03-13" -#define RUBY_PATCHLEVEL 71 +#define RUBY_PATCHLEVEL 72 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3