Deprecate taint/trust and related methods, and make the methods no-ops

This removes the related tests, and puts the related specs behind
version guards.  This affects all code in lib, including some
libraries that may want to support older versions of Ruby.

1 files changed, 30 insertions, 26 deletions

diff --git a/spec/ruby/core/string/scan_spec.rb b/spec/ruby/core/string/scan_spec.rb
index 06400fc745..024e97022a 100644
--- a/spec/ruby/core/string/scan_spec.rb
+++ b/spec/ruby/core/string/scan_spec.rb
@@ -65,24 +65,26 @@ describe "String#scan" do
     -> { "cruel world".scan(mock('x')) }.should raise_error(TypeError)
   end
 
-  it "taints the results if the String argument is tainted" do
-    a = "hello hello hello".scan("hello".taint)
-    a.each { |m| m.tainted?.should be_true }
-  end
+  ruby_version_is ''...'2.7' do
+    it "taints the results if the String argument is tainted" do
+      a = "hello hello hello".scan("hello".taint)
+      a.each { |m| m.tainted?.should be_true }
+    end
 
-  it "taints the results when passed a String argument if self is tainted" do
-    a = "hello hello hello".taint.scan("hello")
-    a.each { |m| m.tainted?.should be_true }
-  end
+    it "taints the results when passed a String argument if self is tainted" do
+      a = "hello hello hello".taint.scan("hello")
+      a.each { |m| m.tainted?.should be_true }
+    end
 
-  it "taints the results if the Regexp argument is tainted" do
-    a = "hello".scan(/./.taint)
-    a.each { |m| m.tainted?.should be_true }
-  end
+    it "taints the results if the Regexp argument is tainted" do
+      a = "hello".scan(/./.taint)
+      a.each { |m| m.tainted?.should be_true }
+    end
 
-  it "taints the results when passed a Regexp argument if self is tainted" do
-    a = "hello".taint.scan(/./)
-    a.each { |m| m.tainted?.should be_true }
+    it "taints the results when passed a Regexp argument if self is tainted" do
+      a = "hello".taint.scan(/./)
+      a.each { |m| m.tainted?.should be_true }
+    end
   end
 
   # jruby/jruby#5513
@@ -171,20 +173,22 @@ describe "String#scan with pattern and block" do
     $~.should == nil
   end
 
-  it "taints the results if the String argument is tainted" do
-    "hello hello hello".scan("hello".taint).each { |m| m.tainted?.should be_true }
-  end
+  ruby_version_is ''...'2.7' do
+    it "taints the results if the String argument is tainted" do
+      "hello hello hello".scan("hello".taint).each { |m| m.tainted?.should be_true }
+    end
 
-  it "taints the results when passed a String argument if self is tainted" do
-    "hello hello hello".taint.scan("hello").each { |m| m.tainted?.should be_true }
-  end
+    it "taints the results when passed a String argument if self is tainted" do
+      "hello hello hello".taint.scan("hello").each { |m| m.tainted?.should be_true }
+    end
 
-  it "taints the results if the Regexp argument is tainted" do
-    "hello".scan(/./.taint).each { |m| m.tainted?.should be_true }
-  end
+    it "taints the results if the Regexp argument is tainted" do
+      "hello".scan(/./.taint).each { |m| m.tainted?.should be_true }
+    end
 
-  it "taints the results when passed a Regexp argument if self is tainted" do
-    "hello".taint.scan(/./).each { |m| m.tainted?.should be_true }
+    it "taints the results when passed a Regexp argument if self is tainted" do
+      "hello".taint.scan(/./).each { |m| m.tainted?.should be_true }
+    end
   end
 
   it "passes block arguments as individual arguments when blocks are provided" do