Skip to content

Commit fb3be2c

Browse files
Set Ruby to 3.1.2
1 parent 677baf2 commit fb3be2c

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

.bundle/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
BUNDLE_JOBS: "4"

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.7.1
1+
ruby-3.1.2

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44

5-
ruby '2.7.1'
5+
ruby '3.1.2'
66

77
gem 'activesupport', '~> 6.0', '>= 6.0.3.2', require: 'active_support/all'
88
gem 'minitest', '~> 5.14', '>= 5.14.1'

Gemfile.lock

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
GIT
22
remote: https://github.com/kern/minitest-reporters.git
3-
revision: 9cb9e78aed69bfe4eed6c27b5b795e8bb4ad708f
3+
revision: 466b060a906298148836e368916aee930d28f618
44
specs:
5-
minitest-reporters (1.4.2)
5+
minitest-reporters (1.5.0)
66
ansi
77
builder
88
minitest (>= 5.0)
@@ -11,29 +11,28 @@ GIT
1111
GEM
1212
remote: https://rubygems.org/
1313
specs:
14-
activesupport (6.0.3.2)
14+
activesupport (6.1.6)
1515
concurrent-ruby (~> 1.0, >= 1.0.2)
16-
i18n (>= 0.7, < 2)
17-
minitest (~> 5.1)
18-
tzinfo (~> 1.1)
19-
zeitwerk (~> 2.2, >= 2.2.2)
16+
i18n (>= 1.6, < 2)
17+
minitest (>= 5.1)
18+
tzinfo (~> 2.0)
19+
zeitwerk (~> 2.3)
2020
ansi (1.5.0)
2121
builder (3.2.4)
2222
coderay (1.1.3)
23-
concurrent-ruby (1.1.6)
24-
i18n (1.8.3)
23+
concurrent-ruby (1.1.10)
24+
i18n (1.10.0)
2525
concurrent-ruby (~> 1.0)
2626
method_source (1.0.0)
27-
minitest (5.14.1)
27+
minitest (5.15.0)
2828
pry (0.13.1)
2929
coderay (~> 1.1)
3030
method_source (~> 1.0)
31-
rake (13.0.1)
32-
ruby-progressbar (1.10.1)
33-
thread_safe (0.3.6)
34-
tzinfo (1.2.7)
35-
thread_safe (~> 0.1)
36-
zeitwerk (2.4.0)
31+
rake (13.0.6)
32+
ruby-progressbar (1.11.0)
33+
tzinfo (2.0.4)
34+
concurrent-ruby (~> 1.0)
35+
zeitwerk (2.5.4)
3736

3837
PLATFORMS
3938
mswin64
@@ -48,7 +47,7 @@ DEPENDENCIES
4847
rake (~> 13.0, >= 13.0.1)
4948

5049
RUBY VERSION
51-
ruby 2.7.1p83
50+
ruby 3.1.2p20
5251

5352
BUNDLED WITH
5453
2.1.4

lib/compiler.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ def local_toolchain_env
789789
{
790790
'CI' => 'true',
791791
'GEM_PATH' => File.join(@ruby_install, 'lib', 'ruby', 'gems', self.class.ruby_api_version),
792-
'PATH' => "#{File.join(@ruby_install, 'bin')}:#{ENV['PATH']}",
792+
'PATH' => "#{File.join(@ruby_install, 'bin')}:#{ENV.fetch('PATH', nil)}",
793793
'ENCLOSE_IO_USE_ORIGINAL_RUBY' => 'true',
794794
'ENCLOSE_IO_RUBYC_1ST_PASS' => 'true',
795795
'ENCLOSE_IO_RUBYC_2ND_PASS' => nil

lib/compiler/utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def cp(from, to)
9090

9191
def cp_r(from, to, options = {})
9292
warn "-> cp -r #{from.inspect} #{to.inspect}" unless @options[:quiet]
93-
FileUtils.cp_r(from, to, options)
93+
FileUtils.cp_r(from, to, **options)
9494
end
9595

9696
def rm(path)

test/roundtrip/test_rubyc.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ def ruby(*args)
3030

3131
Thread.new do
3232
until (raw_line = stdout.gets).nil?
33-
parsed_line = Hash[timestamp: Time.now, line: raw_line.to_s]
33+
parsed_line = { timestamp: Time.now, line: raw_line.to_s }
3434
$stdout.puts "rubyc's ruby STDOUT: #{parsed_line}"
3535
end
3636
end
3737

3838
Thread.new do
3939
until (raw_line = stderr.gets).nil?
40-
parsed_line = Hash[timestamp: Time.now, line: raw_line.to_s]
40+
parsed_line = { timestamp: Time.now, line: raw_line.to_s }
4141
warn "rubyc's ruby STDERR: #{parsed_line}"
4242
end
4343
end

0 commit comments

Comments
 (0)