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.

2 files changed, 30 insertions, 26 deletions

diff --git a/spec/ruby/core/matchdata/post_match_spec.rb b/spec/ruby/core/matchdata/post_match_spec.rb
index 6e13438124..4ae51f107e 100644
--- a/spec/ruby/core/matchdata/post_match_spec.rb
+++ b/spec/ruby/core/matchdata/post_match_spec.rb
@@ -6,20 +6,22 @@ describe "MatchData#post_match" do
     $'.should == ': The Movie'
   end
 
-  it "keeps taint status from the source string" do
-    str = "THX1138: The Movie"
-    str.taint
-    res = /(.)(.)(\d+)(\d)/.match(str).post_match
-    res.tainted?.should be_true
-    $'.tainted?.should be_true
-  end
+  ruby_version_is ''...'2.7' do
+    it "keeps taint status from the source string" do
+      str = "THX1138: The Movie"
+      str.taint
+      res = /(.)(.)(\d+)(\d)/.match(str).post_match
+      res.tainted?.should be_true
+      $'.tainted?.should be_true
+    end
 
-  it "keeps untrusted status from the source string" do
-    str = "THX1138: The Movie"
-    str.untrust
-    res = /(.)(.)(\d+)(\d)/.match(str).post_match
-    res.untrusted?.should be_true
-    $'.untrusted?.should be_true
+    it "keeps untrusted status from the source string" do
+      str = "THX1138: The Movie"
+      str.untrust
+      res = /(.)(.)(\d+)(\d)/.match(str).post_match
+      res.untrusted?.should be_true
+      $'.untrusted?.should be_true
+    end
   end
 
   it "sets the encoding to the encoding of the source String" do
diff --git a/spec/ruby/core/matchdata/pre_match_spec.rb b/spec/ruby/core/matchdata/pre_match_spec.rb
index 816cc91eb2..824612c84c 100644
--- a/spec/ruby/core/matchdata/pre_match_spec.rb
+++ b/spec/ruby/core/matchdata/pre_match_spec.rb
@@ -6,20 +6,22 @@ describe "MatchData#pre_match" do
     $`.should == 'T'
   end
 
-  it "keeps taint status from the source string" do
-    str = "THX1138: The Movie"
-    str.taint
-    res = /(.)(.)(\d+)(\d)/.match(str).pre_match
-    res.tainted?.should be_true
-    $`.tainted?.should be_true
-  end
+  ruby_version_is ''...'2.7' do
+    it "keeps taint status from the source string" do
+      str = "THX1138: The Movie"
+      str.taint
+      res = /(.)(.)(\d+)(\d)/.match(str).pre_match
+      res.tainted?.should be_true
+      $`.tainted?.should be_true
+    end
 
-  it "keeps untrusted status from the source string" do
-    str = "THX1138: The Movie"
-    str.untrust
-    res = /(.)(.)(\d+)(\d)/.match(str).pre_match
-    res.untrusted?.should be_true
-    $`.untrusted?.should be_true
+    it "keeps untrusted status from the source string" do
+      str = "THX1138: The Movie"
+      str.untrust
+      res = /(.)(.)(\d+)(\d)/.match(str).pre_match
+      res.untrusted?.should be_true
+      $`.untrusted?.should be_true
+    end
   end
 
   it "sets the encoding to the encoding of the source String" do