archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Show the removal version

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-12-28 19:17:52 +09:00
parent 8118d435d0
commit 0b726924a4
Notes: git 2021-06-30 10:47:37 +09:00
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
error.c
View file

@ -493,11 +493,13 @@ deprecation_warning_enabled(void)
}
static void
warn_deprecated(VALUE mesg, bool removal, const char *suggest)
warn_deprecated(VALUE mesg, const char *removal, const char *suggest)
{
rb_str_set_len(mesg, RSTRING_LEN(mesg) - 1);
rb_str_cat_cstr(mesg, " is deprecated");
if (removal) rb_str_cat_cstr(mesg, ", and is planned for removal");
if (removal) {
rb_str_catf(mesg, " and will be removed in Ruby %s", removal);
}
if (suggest) rb_str_catf(mesg, "; use %s instead", suggest);
rb_str_cat_cstr(mesg, "\n");
rb_warn_category(mesg, ID2SYM(id_deprecated));
@ -513,11 +515,11 @@ rb_warn_deprecated(const char *fmt, const char *suggest, ...)
VALUE mesg = warning_string(0, fmt, args);
va_end(args);
warn_deprecated(mesg, false, suggest);
warn_deprecated(mesg, NULL, suggest);
}
void
rb_warn_deprecated_to_remove(const char *fmt, const char *suggest, ...)
rb_warn_deprecated_to_remove(const char *removal, const char *fmt, const char *suggest, ...)
{
if (!deprecation_warning_enabled()) return;
@ -526,7 +528,7 @@ rb_warn_deprecated_to_remove(const char *fmt, const char *suggest, ...)
VALUE mesg = warning_string(0, fmt, args);
va_end(args);
warn_deprecated(mesg, true, suggest);
warn_deprecated(mesg, removal, suggest);
}
static inline int