Skip to content

Make parser's #inspect work in non-main Ractors #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
y-yagi wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −8
Open

Make parser's #inspect work in non-main Ractors #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions lib/uri/rfc2396_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,13 @@ def unescape(str, escaped = @regexp[:ESCAPED])
str.gsub(escaped) { [$&[1, 2]].pack('H2').force_encoding(enc) }
end

TO_S = Kernel.instance_method(:to_s) # :nodoc:
if TO_S.respond_to?(:bind_call)
if UnboundMethod.method_defined?(:bind_call)
def inspect # :nodoc:
TO_S.bind_call(self)
Kernel.instance_method(:to_s).bind_call(self)
end
else
def inspect # :nodoc:
TO_S.bind(self).call
Kernel.instance_method(:to_s).bind(self).call
end
end

Expand Down
7 changes: 3 additions & 4 deletions lib/uri/rfc3986_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,13 @@ def unescape(str, escaped = nil) # :nodoc:
escaped ? RFC2396_PARSER.unescape(str, escaped) : RFC2396_PARSER.unescape(str)
end

@@to_s = Kernel.instance_method(:to_s)
if @@to_s.respond_to?(:bind_call)
if UnboundMethod.method_defined?(:bind_call)
def inspect
@@to_s.bind_call(self)
Kernel.instance_method(:to_s).bind_call(self)
end
else
def inspect
@@to_s.bind(self).call
Kernel.instance_method(:to_s).bind(self).call
end
end

Expand Down
5 changes: 5 additions & 0 deletions test/uri/test_common.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ def test_ractor
assert_ractor(<<~RUBY, require: 'uri')
r = Ractor.new { URI.parse("https://ruby-lang.org/").inspect }
assert_equal(URI.parse("https://ruby-lang.org/").inspect, r.value)

r = Ractor.new { [URI::RFC3986_PARSER.inspect, URI::RFC2396_PARSER.inspect] }
rfc3986, rfc2396 = r.value
assert_match(/URI::RFC3986_Parser/, rfc3986)
assert_match(/URI::RFC2396_Parser/, rfc2396)
RUBY
end

Expand Down