1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Simplify double loop

Browse Source 
https://github.com/rubygems/rubygems/commit/630dc02112
This commit is contained in:
Nobuyoshi Nakada 2023-07-19 22:42:20 +09:00 committed by git
parent 1b27e7aa1f
commit 70eeec0cad
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/rubygems/core_ext/kernel_require.rb
View File

@ -44,20 +44,16 @@ module Kernel
resolved_path = begin resolved_path = begin
rp = nil rp = nil
load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
Gem.suffixes.each do |s| Gem.suffixes.find do |s|
$LOAD_PATH[0...load_path_check_index].each do |lp| $LOAD_PATH[0...load_path_check_index].find do |lp|
safe_lp = lp.dup.tap(&Gem::UNTAINT) safe_lp = lp.dup.tap(&Gem::UNTAINT)
if File.symlink? safe_lp # for backward compatibility if File.symlink? safe_lp # for backward compatibility
next next
end end
full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}")) full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
if File.file?(full_path) rp = full_path if File.file?(full_path)
rp = full_path
break
end
end end
break if rp
end end
rp rp
end end