diff options
author | Jeremy Evans <code@jeremyevans.net> | 2019-10-07 13:16:33 -0700 |
---|---|---|
committer | Jeremy Evans <code@jeremyevans.net> | 2019-10-07 13:51:21 -0700 |
commit | c0eae130b1d9fde5716c2340141d78ebc48c82a5 (patch) | |
tree | 8605a81564c06722694eb8f8aba6359fc3275b8a | |
parent | 055a85d3d9ab5850b1269089f28385158d969d18 (diff) | |
download | ruby-c0eae130b1d9fde5716c2340141d78ebc48c82a5.tar.gz |
Note RB_PASS_EMPTY_KEYWORDS and RB_SCAN_ARGS_EMPTY_KEYWORDS will be removed
There is no need for these in Ruby 3.0, and the plan is to
remove them.
-rw-r--r-- | doc/extension.rdoc | 2 | ||||
-rw-r--r-- | include/ruby/ruby.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/extension.rdoc b/doc/extension.rdoc index 8162c5ea1f..7807f98d6f 100644 --- a/doc/extension.rdoc +++ b/doc/extension.rdoc @@ -468,6 +468,7 @@ To specify whether keyword arguments are passed when calling super: RB_NO_KEYWORDS :: Do not pass keywords RB_PASS_KEYWORDS :: Pass keywords, final argument should be a hash of keywords RB_PASS_EMPTY_KEYWORDS :: Pass empty keywords (not included in arguments) + (this will be removed in Ruby 3.0) RB_PASS_CALLED_KEYWORDS :: Pass keywords if current method was called with keywords, useful for argument delegation @@ -1483,6 +1484,7 @@ rb_scan_args_kw(int kw_splat, int argc, VALUE *argv, const char *fmt, ...) :: RB_SCAN_ARGS_KEYWORDS :: The final argument should be a hash treated as keywords. RB_SCAN_ARGS_EMPTY_KEYWORDS :: Don't treat a final hash as keywords. + (this will be removed in Ruby 3.0) RB_SCAN_ARGS_LAST_HASH_KEYWORDS :: Treat a final argument as keywords if it is a hash, and not as keywords otherwise. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 2ec0cc84ae..734cc939af 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1903,7 +1903,7 @@ VALUE rb_funcall_with_block_kw(VALUE, ID, int, const VALUE*, VALUE, int); int rb_scan_args(int, const VALUE*, const char*, ...); #define RB_SCAN_ARGS_PASS_CALLED_KEYWORDS 0 #define RB_SCAN_ARGS_KEYWORDS 1 -#define RB_SCAN_ARGS_EMPTY_KEYWORDS 2 +#define RB_SCAN_ARGS_EMPTY_KEYWORDS 2 /* Will be removed in 3.0 */ #define RB_SCAN_ARGS_LAST_HASH_KEYWORDS 3 int rb_scan_args_kw(int, int, const VALUE*, const char*, ...); VALUE rb_call_super(int, const VALUE*); @@ -1978,7 +1978,7 @@ VALUE rb_yield_splat_kw(VALUE, int); VALUE rb_yield_block(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)); /* rb_block_call_func */ #define RB_NO_KEYWORDS 0 #define RB_PASS_KEYWORDS 1 -#define RB_PASS_EMPTY_KEYWORDS 2 +#define RB_PASS_EMPTY_KEYWORDS 2 /* Will be removed in 3.0 */ #define RB_PASS_CALLED_KEYWORDS 3 int rb_keyword_given_p(void); int rb_block_given_p(void); |