diff options
author | nagachika <nagachika@ruby-lang.org> | 2022-11-13 11:22:53 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2022-11-13 11:22:53 +0900 |
commit | f8044a770009b78d46b583600c9bd6660328303f (patch) | |
tree | dcf66bb83f456fe315b4b082dc656badab5dc99b | |
parent | 728d9f18348bcffedb0880c67015f08a7c19665f (diff) |
merge revision(s) 131c31a9209c61f84d318aa18b61f468f48b8219: [Backport #19081]
[Bug #19081] Show the caller location in warning for Ractor
The internal location in ractor.rb is not usefull at all.
```
$ ruby -e 'Ractor.new {}'
<internal:ractor>:267: warning: Ractor is experimental, ...
```
---
bootstraptest/test_ractor.rb | 6 ++++++
ractor.c | 6 ------
ractor.rb | 4 ++++
3 files changed, 10 insertions(+), 6 deletions(-)
-rw-r--r-- | bootstraptest/test_ractor.rb | 6 | ||||
-rw-r--r-- | ractor.c | 6 | ||||
-rw-r--r-- | ractor.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb index b29db7ab0e..95c4a39ab4 100644 --- a/bootstraptest/test_ractor.rb +++ b/bootstraptest/test_ractor.rb @@ -1579,4 +1579,10 @@ assert_equal "ok", %q{ end } +assert_match /\Atest_ractor\.rb:1:\s+warning:\s+Ractor is experimental/, %q{ + Warning[:experimental] = $VERBOSE = true + STDERR.reopen(STDOUT) + eval("Ractor.new{}.take", nil, "test_ractor.rb", 1) +} + end # if !ENV['GITHUB_WORKFLOW'] @@ -1432,12 +1432,6 @@ cancel_single_ractor_mode(void) } ruby_single_main_ractor = NULL; - - if (rb_warning_category_enabled_p(RB_WARN_CATEGORY_EXPERIMENTAL)) { - rb_category_warn(RB_WARN_CATEGORY_EXPERIMENTAL, - "Ractor is experimental, and the behavior may change in future versions of Ruby! " - "Also there are many implementation issues."); - } } static void @@ -262,6 +262,10 @@ class Ractor def self.new(*args, name: nil, &block) b = block # TODO: builtin bug raise ArgumentError, "must be called with a block" unless block + if __builtin_cexpr!("RBOOL(ruby_single_main_ractor)") + warn("Ractor is experimental, and the behavior may change in future versions of Ruby! " \ + "Also there are many implementation issues.", uplevel: 0, category: :experimental) + end loc = caller_locations(1, 1).first loc = "#{loc.path}:#{loc.lineno}" __builtin_ractor_create(loc, name, args, b) @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 180 +#define RUBY_PATCHLEVEL 181 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 11 |