Use `rb_warn_deprecated` for `File.exists?` and `Dir.exists?`

5 files changed, 5 insertions, 32 deletions

diff --git a/dir.c b/dir.c
index 5013b9b66f..5bd4ff42af 100644
--- a/dir.c
+++ b/dir.c
@@ -3498,7 +3498,7 @@ rb_file_directory_p(void)
 static VALUE
 rb_dir_exists_p(VALUE obj, VALUE fname)
 {
-    rb_warning("Dir.exists? is a deprecated name, use Dir.exist? instead");
+    rb_warn_deprecated("", "Dir.exist?");
     return rb_file_directory_p(obj, fname);
 }
 
diff --git a/file.c b/file.c
index c267781d20..929dac8c34 100644
--- a/file.c
+++ b/file.c
@@ -1782,16 +1782,16 @@ rb_file_exist_p(VALUE obj, VALUE fname)
 static VALUE
 rb_file_exists_p(VALUE obj, VALUE fname)
 {
-    const char *s = "FileTest#";
+    const char *s = "FileTest#exist?";
     if (obj == rb_mFileTest) {
-	s = "FileTest.";
+	s = "FileTest.exist?";
     }
     else if (obj == rb_cFile ||
 	     (RB_TYPE_P(obj, T_CLASS) &&
 	      RTEST(rb_class_inherited_p(obj, rb_cFile)))) {
-	s = "File.";
+	s = "File.exist?";
     }
-    rb_warning("%sexists? is a deprecated name, use %sexist? instead", s, s);
+    rb_warn_deprecated("", s);
     return rb_file_exist_p(obj, fname);
 }
 
diff --git a/spec/ruby/core/dir/exists_spec.rb b/spec/ruby/core/dir/exists_spec.rb
deleted file mode 100644
index 2c6f145db2..0000000000
--- a/spec/ruby/core/dir/exists_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'fixtures/common'
-require_relative 'shared/exist'
-
-describe "Dir.exists?" do
-  before :all do
-    DirSpecs.create_mock_dirs
-  end
-
-  after :all do
-    DirSpecs.delete_mock_dirs
-  end
-
-  it_behaves_like :dir_exist, :exists?
-end
diff --git a/spec/ruby/core/file/exists_spec.rb b/spec/ruby/core/file/exists_spec.rb
deleted file mode 100644
index 31d0e4dd1e..0000000000
--- a/spec/ruby/core/file/exists_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require_relative '../../spec_helper'
-require_relative '../../shared/file/exist'
-
-describe "File.exists?" do
-  it_behaves_like :file_exist, :exists?, File
-end
diff --git a/spec/ruby/core/filetest/exists_spec.rb b/spec/ruby/core/filetest/exists_spec.rb
deleted file mode 100644
index d090d7d740..0000000000
--- a/spec/ruby/core/filetest/exists_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require_relative '../../spec_helper'
-require_relative '../../shared/file/exist'
-
-describe "FileTest.exists?" do
-  it_behaves_like :file_exist, :exists?, FileTest
-end