Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions LEGAL
Original file line number Diff line number Diff line change
Expand Up @@ -713,9 +713,8 @@ mentioned below.
Copyright (c) 2022 James Edward Anhalt III - https://github.com/jeaiii/itoa

{MIT License}[rdoc-ref:@MIT+License]


[ext/json/ext/vendor/ryu.h]
[ext/json/vendor/ryu.h]
This file is adapted from the Ryu algorithm by Ulf Adams https://github.com/ulfjack/ryu.
It is dual-licensed under {Apache License 2.0}[rdoc-ref:@Apache+License+2.0] OR
{Boost Software License 1.0}[rdoc-ref:@Boost+Software+License+1.0].
Expand Down Expand Up @@ -1071,21 +1070,21 @@ mentioned below.

>>>
Boost Software License - Version 1.0 - August 17th, 2003

Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:

The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
Expand Down
1 change: 0 additions & 1 deletion lib/rubygems/commands/rebuild_command.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# frozen_string_literal: true

require "date"
require "digest"
require "fileutils"
require "tmpdir"
Expand Down
14 changes: 7 additions & 7 deletions spec/bundled_gems_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def script(code, options = {})
require "active_support/all"
RUBY

expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/)
expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
expect(err).to include(/lib\/active_support\/all\.rb:1/)
end

Expand Down Expand Up @@ -159,7 +159,7 @@ def script(code, options = {})

bundle "exec ruby script.rb"

expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/)
expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
expect(err).to include(/script\.rb:8/)
end

Expand All @@ -177,7 +177,7 @@ def script(code, options = {})

bundle "exec ./script.rb"

expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/)
expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
expect(err).to include(/script\.rb:9/)
end

Expand All @@ -186,7 +186,7 @@ def script(code, options = {})
create_file("Gemfile", "source 'https://rubygems.org'")
bundle "exec ruby -r./stub -ropenssl -e ''"

expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/)
expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
end

it "Show warning when warn is not the standard one in the current scope" do
Expand All @@ -209,7 +209,7 @@ def my
My.my
RUBY

expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/)
expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
expect(err).to include(/-e:19/)
end

Expand Down Expand Up @@ -251,7 +251,7 @@ def my
require Gem::BUNDLED_GEMS::ARCHDIR + 'openssl'
RUBY

expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/)
expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
# TODO: We should assert caller location like below:
# test_warn_bootsnap.rb:14: warning: ...
end
Expand Down Expand Up @@ -320,7 +320,7 @@ def my
create_file("Gemfile", "source 'https://rubygems.org'")
bundle "exec ruby script.rb"

expect(err).to include(/openssl used to be loaded from (.*) since Ruby 4.0.0/)
expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
expect(err).to include(/script\.rb:13/)
end

Expand Down
2 changes: 0 additions & 2 deletions tool/rbs_skip_tests_windows
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ test_new(TempfileSingletonTest)
# Errno::EACCES: Permission denied @ apply2files - C:/a/_temp/d20250813-10156-f8z9pn/test.gz
test_open(ZlibGzipReaderSingletonTest)

test_reachable_objects_from_root(ObjectSpaceTest) To avoid NoMemoryError with test-unit 3.7.5

# Errno::EACCES: Permission denied @ rb_file_s_rename
# D:/a/ruby/ruby/src/lib/rubygems/util/atomic_file_writer.rb:42:in 'File.rename'
test_write_binary(GemSingletonTest)