diff options
| author | Jeremy Evans <code@jeremyevans.net> | 2020-06-10 18:53:25 -0700 |
|---|---|---|
| committer | Jeremy Evans <code@jeremyevans.net> | 2020-06-18 08:21:29 -0700 |
| commit | 95dc9c07f3a895f45cfb5dab235cd78f157a9e51 (patch) | |
| tree | c5ed4ca00c1700b1c4aa1cea958bb4767acd1ecf /variable.c | |
| parent | aae8223c7076483f1f1641181088790b2f3a66dd (diff) | |
| download | ruby-95dc9c07f3a895f45cfb5dab235cd78f157a9e51.tar.gz | |
Raise RuntimeError for class variable overtaken in nonverbose mode
900e83b50115afda3f79712310e4cb95e4508972 changed from a warning
to an error in this case, but the warning was only issued in
verbose mode, and therefore the error was only raised in verbose
mode. That was not intentional, verbose mode should only change
whether warnings are emitted, not other behavior. This issues
the RuntimeError in all cases.
This change broke a couple tests, as the tests actually issued
the warning and therefore now raise an error. This wasn't caught
earlier as test_variable suppressed the warning in this case,
effectively setting $VERBOSE = false around the code that warned.
basictest isn't run in verbose mode and therefore didn't expose
the issue previously. Fix these tests.
Fixes [Bug #14541]
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/variable.c b/variable.c index 0d8a424438..15c4288993 100644 --- a/variable.c +++ b/variable.c @@ -3105,7 +3105,7 @@ cvar_overtaken(VALUE front, VALUE target, ID id) if (front && target != front) { st_data_t did = (st_data_t)id; - if (RTEST(ruby_verbose) && original_module(front) != original_module(target)) { + if (original_module(front) != original_module(target)) { rb_raise(rb_eRuntimeError, "class variable % "PRIsVALUE" of %"PRIsVALUE" is overtaken by %"PRIsVALUE"", ID2SYM(id), rb_class_name(original_module(front)), |