summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2022-01-01 11:36:54 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2022-01-01 18:55:52 +0900
commitfae0b664315c23ef7db451f6241d256c12217051 (patch)
tree5dfc239c5976f358a61021e2b14660d63c5d1c92
parent84891bffe8e68e12a7881d2bbae0db8267035e8a (diff)
downloadruby-fae0b664315c23ef7db451f6241d256c12217051.tar.gz
Remove deprecated Random::DEFAULT [Feature #17351]
-rw-r--r--random.c3
-rw-r--r--spec/ruby/core/random/default_spec.rb20
-rw-r--r--test/ruby/test_rand.rb6
3 files changed, 14 insertions, 15 deletions
diff --git a/random.c b/random.c
index f3dec5cca2..dc7e4771cd 100644
--- a/random.c
+++ b/random.c
@@ -1816,9 +1816,6 @@ InitVM_Random(void)
rb_define_method(rb_cRandom, "seed", random_get_seed, 0);
#endif
- rb_define_const(rb_cRandom, "DEFAULT", rb_cRandom);
- rb_deprecate_constant(rb_cRandom, "DEFAULT");
-
rb_define_singleton_method(rb_cRandom, "srand", rb_f_srand, -1);
rb_define_singleton_method(rb_cRandom, "rand", random_s_rand, -1);
rb_define_singleton_method(rb_cRandom, "bytes", random_s_bytes, 1);
diff --git a/spec/ruby/core/random/default_spec.rb b/spec/ruby/core/random/default_spec.rb
index 90d3b1720d..f9270ac7bb 100644
--- a/spec/ruby/core/random/default_spec.rb
+++ b/spec/ruby/core/random/default_spec.rb
@@ -1,15 +1,17 @@
require_relative '../../spec_helper'
-describe "Random::DEFAULT" do
- it "returns a random number generator" do
- suppress_warning do
- Random::DEFAULT.should respond_to(:rand)
+ruby_version_is ''...'3.2' do
+ describe "Random::DEFAULT" do
+ it "returns a random number generator" do
+ suppress_warning do
+ Random::DEFAULT.should respond_to(:rand)
+ end
end
- end
- it "changes seed on reboot" do
- seed1 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
- seed2 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
- seed1.should != seed2
+ it "changes seed on reboot" do
+ seed1 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
+ seed2 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
+ seed1.should != seed2
+ end
end
end
diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb
index 13b7329269..f066433f6a 100644
--- a/test/ruby/test_rand.rb
+++ b/test/ruby/test_rand.rb
@@ -317,7 +317,7 @@ class TestRand < Test::Unit::TestCase
assert_equal(r1, r2, bug5661)
assert_fork_status(1, '[ruby-core:82100] [Bug #13753]') do
- Random::DEFAULT.rand(4)
+ Random.rand(4)
end
rescue NotImplementedError
end
@@ -395,8 +395,8 @@ class TestRand < Test::Unit::TestCase
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
verbose, $VERBOSE = $VERBOSE, nil
- seed = Random::DEFAULT::seed
- rand1 = Random::DEFAULT::rand
+ seed = Random.seed
+ rand1 = Random.rand
$VERBOSE = verbose
rand2 = Random.new(seed).rand
assert_equal(rand1, rand2)