Skip to content

Remove ruby2_keyword usage #559

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
Earlopain wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove ruby2_keyword usage #559

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
48 changes: 12 additions & 36 deletions lib/bootsnap/compile_cache/yaml.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,15 +226,11 @@ def input_to_output(data, _path, kwargs)
end

module Patch
def load_file(path, *args)
def load_file(path, *unknown_args, **kwargs)
return super unless CompileCache::YAML.supported_internal_encoding?

return super if args.size > 1

if (kwargs = args.first)
return super unless kwargs.is_a?(Hash)
return super unless (kwargs.keys - CompileCache::YAML.supported_options).empty?
end
return super if unknown_args.size > 1
return super unless (kwargs.keys - CompileCache::YAML.supported_options).empty?

CompileCache::Native.fetch(
CompileCache::YAML.cache_dir,
Expand All @@ -245,17 +241,11 @@ def load_file(path, *args)
)
end

ruby2_keywords :load_file if respond_to?(:ruby2_keywords, true)

def unsafe_load_file(path, *args)
def unsafe_load_file(path, *unknown_args, **kwargs)
return super unless CompileCache::YAML.supported_internal_encoding?

return super if args.size > 1

if (kwargs = args.first)
return super unless kwargs.is_a?(Hash)
return super unless (kwargs.keys - CompileCache::YAML.supported_options).empty?
end
return super if unknown_args.size > 1
return super unless (kwargs.keys - CompileCache::YAML.supported_options).empty?

CompileCache::Native.fetch(
CompileCache::YAML.cache_dir,
Expand All @@ -265,8 +255,6 @@ def unsafe_load_file(path, *args)
kwargs,
)
end

ruby2_keywords :unsafe_load_file if respond_to?(:ruby2_keywords, true)
end
end

Expand Down Expand Up @@ -299,15 +287,11 @@ def input_to_output(data, _path, kwargs)
end

module Patch
def load_file(path, *args)
def load_file(path, *unknown_args, **kwargs)
return super unless CompileCache::YAML.supported_internal_encoding?

return super if args.size > 1

if (kwargs = args.first)
return super unless kwargs.is_a?(Hash)
return super unless (kwargs.keys - CompileCache::YAML.supported_options).empty?
end
return super if unknown_args.size > 1
return super unless (kwargs.keys - CompileCache::YAML.supported_options).empty?

CompileCache::Native.fetch(
CompileCache::YAML.cache_dir,
Expand All @@ -318,17 +302,11 @@ def load_file(path, *args)
)
end

ruby2_keywords :load_file if respond_to?(:ruby2_keywords, true)

def unsafe_load_file(path, *args)
def unsafe_load_file(path, *unknown_args, **kwargs)
return super unless CompileCache::YAML.supported_internal_encoding?

return super if args.size > 1

if (kwargs = args.first)
return super unless kwargs.is_a?(Hash)
return super unless (kwargs.keys - CompileCache::YAML.supported_options).empty?
end
return super if unknown_args.size > 1
return super unless (kwargs.keys - CompileCache::YAML.supported_options).empty?

CompileCache::Native.fetch(
CompileCache::YAML.cache_dir,
Expand All @@ -338,8 +316,6 @@ def unsafe_load_file(path, *args)
kwargs,
)
end

ruby2_keywords :unsafe_load_file if respond_to?(:ruby2_keywords, true)
end
end
end
Expand Down