Skip to content

Commit 05a8515

Browse files
author
devkadirselcuk
authored
Merge pull request ruby#45 from ruby/master
[pull] master from ruby:master
2 parents e103966 + 864ad8b commit 05a8515

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3419
-408
lines changed

‎LEGAL‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,43 @@ mentioned below.
969969

970970
{MIT License}[rdoc-label:label-MIT+License]
971971

972+
[lib/bundler/vendor/thor]
973+
974+
Thor is under the following license.
975+
976+
>>>
977+
Copyright (c) 2008 Yehuda Katz, Eric Hodel, et al.
978+
979+
{MIT License}[rdoc-label:label-MIT+License]
980+
981+
[lib/rubygems/resolver/molinillo]
982+
[lib/bundler/vendor/molinillo]
983+
984+
molinillo is under the following license.
985+
986+
>>>
987+
Copyright (c) 2014 Samuel E. Giddins [email protected]
988+
989+
{MIT License}[rdoc-label:label-MIT+License]
990+
991+
[lib/bundler/vendor/connection_pool]
992+
993+
connection_pool is under the following license.
994+
995+
>>>
996+
Copyright (c) 2011 Mike Perham
997+
998+
{MIT License}[rdoc-label:label-MIT+License]
999+
1000+
[lib/bundler/vendor/net-http-persistent]
1001+
1002+
net-http-persistent is under the following license.
1003+
1004+
>>>
1005+
Copyright (c) Eric Hodel, Aaron Patterson
1006+
1007+
{MIT License}[rdoc-label:label-MIT+License]
1008+
9721009
[lib/did_you_mean]
9731010
[lib/did_you_mean.rb]
9741011
[test/did_you_mean]

‎enum.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,12 +2968,12 @@ enum_each_slice_size(VALUE obj, VALUE args, VALUE eobj)
29682968
* returns +self+:
29692969
*
29702970
* a = []
2971-
* (1..10).each_slice(3) {|tuple| a.push(tuple) } # => nil
2971+
* (1..10).each_slice(3) {|tuple| a.push(tuple) }
29722972
* a # => [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]]
29732973
*
29742974
* a = []
29752975
* h = {foo: 0, bar: 1, baz: 2, bat: 3, bam: 4}
2976-
* h.each_slice(2) {|tuple| a.push(tuple) } # => nil
2976+
* h.each_slice(2) {|tuple| a.push(tuple) }
29772977
* a # => [[[:foo, 0], [:bar, 1]], [[:baz, 2], [:bat, 3]], [[:bam, 4]]]
29782978
*
29792979
* With no block given, returns an Enumerator.
@@ -3047,12 +3047,12 @@ enum_each_cons_size(VALUE obj, VALUE args, VALUE eobj)
30473047
* returns +self+:
30483048
*
30493049
* a = []
3050-
* (1..5).each_cons(3) {|element| a.push(element) } # => nil
3050+
* (1..5).each_cons(3) {|element| a.push(element) }
30513051
* a # => [[1, 2, 3], [2, 3, 4], [3, 4, 5]]
30523052
*
30533053
* a = []
30543054
* h = {foo: 0, bar: 1, baz: 2, bam: 3}
3055-
* h.each_cons(2) {|element| a.push(element) } # => nil
3055+
* h.each_cons(2) {|element| a.push(element) }
30563056
* a # => [[[:foo, 0], [:bar, 1]], [[:bar, 1], [:baz, 2]], [[:baz, 2], [:bam, 3]]]
30573057
*
30583058
* With no block given, returns an Enumerator.
@@ -3068,7 +3068,7 @@ enum_each_cons(VALUE obj, VALUE n)
30683068
if (size <= 0) rb_raise(rb_eArgError, "invalid size");
30693069
RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_cons_size);
30703070
arity = rb_block_arity();
3071-
if (enum_size_over_p(obj, size)) return Qnil;
3071+
if (enum_size_over_p(obj, size)) return obj;
30723072
memo = MEMO_NEW(rb_ary_new2(size), dont_recycle_block_arg(arity), size);
30733073
rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)memo);
30743074

‎ext/date/date.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
Gem::Specification.new do |s|
33
s.name = "date"
4-
s.version = '3.2.0'
4+
s.version = '3.2.1'
55
s.summary = "A subclass of Object includes Comparable module for handling dates."
66
s.description = "A subclass of Object includes Comparable module for handling dates."
77

0 commit comments

Comments
 (0)