Skip to content

Commit 6e7fc94

Browse files
committed
[GR-45621] [GR-53917] Import CRuby 3.2.4
PullRequest: truffleruby/4268
2 parents 2ff3734 + fa48f2b commit 6e7fc94

File tree

633 files changed

+6628
-1965
lines changed

Some content is hidden

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

633 files changed

+6628
-1965
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.2.4

CHANGELOG.md

Lines changed: 1 addition & 0 deletions

doc/contributor/updating-ruby.md

Lines changed: 25 additions & 5 deletions

doc/legal/bundled_gems

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ rake 13.0.6 https://github.com/ruby/rake
55
test-unit 3.5.7 https://github.com/test-unit/test-unit
66
rexml 3.2.5 https://github.com/ruby/rexml
77
rss 0.2.9 https://github.com/ruby/rss
8-
net-ftp 0.2.0 https://github.com/ruby/net-ftp
9-
net-imap 0.3.4 https://github.com/ruby/net-imap
8+
net-ftp 0.2.1 https://github.com/ruby/net-ftp
9+
net-imap 0.3.4.1 https://github.com/ruby/net-imap
1010
net-pop 0.1.2 https://github.com/ruby/net-pop
11-
net-smtp 0.3.3 https://github.com/ruby/net-smtp
11+
net-smtp 0.3.4 https://github.com/ruby/net-smtp
1212
matrix 0.4.2 https://github.com/ruby/matrix
1313
prime 0.1.2 https://github.com/ruby/prime
1414
rbs 2.8.2 https://github.com/ruby/rbs

doc/legal/legal.md

Lines changed: 1 addition & 1 deletion

doc/user/compatibility.md

Lines changed: 1 addition & 1 deletion

lib/cext/ABI_check.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
1

lib/cext/include/ruby/st.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ struct st_table {
9898

9999
enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK, ST_REPLACE};
100100

101+
size_t rb_st_table_size(const struct st_table *tbl);
102+
#define st_table_size rb_st_table_size
101103
st_table *rb_st_init_table(const struct st_hash_type *);
102104
#define st_init_table rb_st_init_table
103105
st_table *rb_st_init_table_with_size(const struct st_hash_type *, st_index_t);

lib/cext/include/truffleruby/truffleruby-abi-version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
// $RUBY_VERSION must be the same as TruffleRuby.LANGUAGE_VERSION.
2121
// $ABI_NUMBER starts at 1 and is incremented for every ABI-incompatible change.
2222

23-
#define TRUFFLERUBY_ABI_VERSION "3.2.2.13"
23+
#define TRUFFLERUBY_ABI_VERSION "3.2.4.1"
2424

2525
#endif

lib/gems/gems/bundler-2.4.10/libexec/bundle renamed to lib/gems/gems/bundler-2.4.19/libexec/bundle

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ end
1010
base_path = File.expand_path("../lib", __dir__)
1111

1212
if File.exist?(base_path)
13-
require_relative "../lib/bundler"
14-
else
15-
require "bundler"
13+
$LOAD_PATH.unshift(base_path)
1614
end
1715

16+
require "bundler"
17+
1818
if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("2.7.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"]
1919
Bundler.ui.warn \
2020
"Your RubyGems version (#{Gem::VERSION}) has a bug that prevents " \
@@ -24,18 +24,10 @@ if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::V
2424
"and silence this warning by running `gem update --system 3.2.3`"
2525
end
2626

27-
if File.exist?(base_path)
28-
require_relative "../lib/bundler/friendly_errors"
29-
else
30-
require "bundler/friendly_errors"
31-
end
27+
require "bundler/friendly_errors"
3228

3329
Bundler.with_friendly_errors do
34-
if File.exist?(base_path)
35-
require_relative "../lib/bundler/cli"
36-
else
37-
require "bundler/cli"
38-
end
30+
require "bundler/cli"
3931

4032
# Allow any command to use --help flag to show help for that command
4133
help_flags = %w[--help -h]

0 commit comments

Comments
 (0)