From 5a9d2da76e89412cc3d13d4197f624a620f85393 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Thu, 30 Apr 2020 09:14:04 -0700 Subject: Remove deprecated rb_require_safe --- include/ruby/3/intern/load.h | 1 - load.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/include/ruby/3/intern/load.h b/include/ruby/3/intern/load.h index 1a1dfb001e..6baf6b72b6 100644 --- a/include/ruby/3/intern/load.h +++ b/include/ruby/3/intern/load.h @@ -32,7 +32,6 @@ int rb_provided(const char*); int rb_feature_provided(const char *, const char **); void rb_provide(const char*); VALUE rb_f_require(VALUE, VALUE); -VALUE rb_require_safe(VALUE, int); /* Remove in 3.0 */ VALUE rb_require_string(VALUE); RUBY3_SYMBOL_EXPORT_END() diff --git a/load.c b/load.c index 0cb0dd3cfa..f917a736f2 100644 --- a/load.c +++ b/load.c @@ -1087,23 +1087,6 @@ ruby_require_internal(const char *fname, unsigned int len) return result == TAG_RETURN ? 1 : result ? -1 : 0; } -VALUE -rb_require_safe(VALUE fname, int safe) -{ - rb_warn("rb_require_safe will be removed in Ruby 3.0"); - rb_execution_context_t *ec = GET_EC(); - int result = require_internal(ec, fname, 1); - - if (result > TAG_RETURN) { - EC_JUMP_TAG(ec, result); - } - if (result < 0) { - load_failed(fname); - } - - return result ? Qtrue : Qfalse; -} - VALUE rb_require_string(VALUE fname) { -- cgit v1.2.3