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

$LOAD_PATH.resolve_feature_path should not raise

Browse Source 
I think it's more friendly and easier to work with to return `nil` when
the feature is not found in the $LOAD_PATH.
This commit is contained in:
David Rodríguez 2019-08-04 13:09:30 +02:00 committed by Kazuhiro NISHIYAMA
parent 37b90bcdc1
commit 02151dad1b
Notes: git 2021-02-16 18:11:52 +09:00 
Merged: https://github.com/ruby/ruby/pull/2317
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
load.c
View File

@ -991,7 +991,7 @@ rb_resolve_feature_path(VALUE klass, VALUE fname)
sym = ID2SYM(rb_intern("so")); sym = ID2SYM(rb_intern("so"));
break; break;
default: default:
load_failed(fname); return Qnil;
} }
return rb_ary_new_from_args(2, sym, path); return rb_ary_new_from_args(2, sym, path);

4
test/ruby/test_require.rb
View File

@ -857,5 +857,9 @@ class TestRequire < Test::Unit::TestCase
$:.replace(paths) $:.replace(paths)
$".replace(loaded) $".replace(loaded)
end end
def test_resolve_feature_path_with_missing_feature
assert_nil($LOAD_PATH.resolve_feature_path("superkalifragilisticoespialidoso"))
end
end end
end end