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, 73 insertions, 67 deletions

diff --git a/spec/ruby/core/string/unpack/p_spec.rb b/spec/ruby/core/string/unpack/p_spec.rb
index a544bc29c1..3e187d674f 100644
--- a/spec/ruby/core/string/unpack/p_spec.rb
+++ b/spec/ruby/core/string/unpack/p_spec.rb
@@ -18,8 +18,10 @@ describe "String#unpack with format 'P'" do
     -> { packed.to_sym.to_s.unpack("P5") }.should raise_error(ArgumentError, /no associated pointer/)
   end
 
-  it "taints the unpacked string" do
-    ["hello"].pack("P").unpack("P5").first.tainted?.should be_true
+  ruby_version_is ''...'2.7' do
+    it "taints the unpacked string" do
+      ["hello"].pack("P").unpack("P5").first.tainted?.should be_true
+    end
   end
 
   it "reads as many characters as specified" do
@@ -46,7 +48,9 @@ describe "String#unpack with format 'p'" do
     -> { packed.to_sym.to_s.unpack("p") }.should raise_error(ArgumentError, /no associated pointer/)
   end
 
-  it "taints the unpacked string" do
-    ["hello"].pack("p").unpack("p").first.tainted?.should be_true
+  ruby_version_is ''...'2.7' do
+    it "taints the unpacked string" do
+      ["hello"].pack("p").unpack("p").first.tainted?.should be_true
+    end
   end
 end
diff --git a/spec/ruby/core/string/unpack/shared/taint.rb b/spec/ruby/core/string/unpack/shared/taint.rb
index 391338192a..061a3e26ad 100644
--- a/spec/ruby/core/string/unpack/shared/taint.rb
+++ b/spec/ruby/core/string/unpack/shared/taint.rb
@@ -1,81 +1,83 @@
 describe :string_unpack_taint, shared: true do
-  it "does not taint returned arrays if given an untainted format string" do
-    "".unpack(unpack_format(2)).tainted?.should be_false
-  end
+  ruby_version_is ''...'2.7' do
+    it "does not taint returned arrays if given an untainted format string" do
+      "".unpack(unpack_format(2)).tainted?.should be_false
+    end
 
-  it "does not taint returned arrays if given a tainted format string" do
-    format_string = unpack_format(2).dup
-    format_string.taint
-    "".unpack(format_string).tainted?.should be_false
-  end
+    it "does not taint returned arrays if given a tainted format string" do
+      format_string = unpack_format(2).dup
+      format_string.taint
+      "".unpack(format_string).tainted?.should be_false
+    end
 
-  it "does not taint returned strings if given an untainted format string" do
-    "".unpack(unpack_format(2)).any?(&:tainted?).should be_false
-  end
+    it "does not taint returned strings if given an untainted format string" do
+      "".unpack(unpack_format(2)).any?(&:tainted?).should be_false
+    end
 
-  it "does not taint returned strings if given a tainted format string" do
-    format_string = unpack_format(2).dup
-    format_string.taint
-    "".unpack(format_string).any?(&:tainted?).should be_false
-  end
+    it "does not taint returned strings if given a tainted format string" do
+      format_string = unpack_format(2).dup
+      format_string.taint
+      "".unpack(format_string).any?(&:tainted?).should be_false
+    end
 
-  it "does not taint returned arrays if given an untainted packed string" do
-    "".unpack(unpack_format(2)).tainted?.should be_false
-  end
+    it "does not taint returned arrays if given an untainted packed string" do
+      "".unpack(unpack_format(2)).tainted?.should be_false
+    end
 
-  it "does not taint returned arrays if given a tainted packed string" do
-    packed_string = ""
-    packed_string.taint
-    packed_string.unpack(unpack_format(2)).tainted?.should be_false
-  end
+    it "does not taint returned arrays if given a tainted packed string" do
+      packed_string = ""
+      packed_string.taint
+      packed_string.unpack(unpack_format(2)).tainted?.should be_false
+    end
 
-  it "does not taint returned strings if given an untainted packed string" do
-    "".unpack(unpack_format(2)).any?(&:tainted?).should be_false
-  end
+    it "does not taint returned strings if given an untainted packed string" do
+      "".unpack(unpack_format(2)).any?(&:tainted?).should be_false
+    end
 
-  it "taints returned strings if given a tainted packed string" do
-    packed_string = ""
-    packed_string.taint
-    packed_string.unpack(unpack_format(2)).all?(&:tainted?).should be_true
-  end
+    it "taints returned strings if given a tainted packed string" do
+      packed_string = ""
+      packed_string.taint
+      packed_string.unpack(unpack_format(2)).all?(&:tainted?).should be_true
+    end
 
-  it "does not untrust returned arrays if given an untrusted format string" do
-    "".unpack(unpack_format(2)).untrusted?.should be_false
-  end
+    it "does not untrust returned arrays if given an untrusted format string" do
+      "".unpack(unpack_format(2)).untrusted?.should be_false
+    end
 
-  it "does not untrust returned arrays if given a untrusted format string" do
-    format_string = unpack_format(2).dup
-    format_string.untrust
-    "".unpack(format_string).untrusted?.should be_false
-  end
+    it "does not untrust returned arrays if given a untrusted format string" do
+      format_string = unpack_format(2).dup
+      format_string.untrust
+      "".unpack(format_string).untrusted?.should be_false
+    end
 
-  it "does not untrust returned strings if given an untainted format string" do
-    "".unpack(unpack_format(2)).any?(&:untrusted?).should be_false
-  end
+    it "does not untrust returned strings if given an untainted format string" do
+      "".unpack(unpack_format(2)).any?(&:untrusted?).should be_false
+    end
 
-  it "does not untrust returned strings if given a untrusted format string" do
-    format_string = unpack_format(2).dup
-    format_string.untrust
-    "".unpack(format_string).any?(&:untrusted?).should be_false
-  end
+    it "does not untrust returned strings if given a untrusted format string" do
+      format_string = unpack_format(2).dup
+      format_string.untrust
+      "".unpack(format_string).any?(&:untrusted?).should be_false
+    end
 
-  it "does not untrust returned arrays if given an trusted packed string" do
-    "".unpack(unpack_format(2)).untrusted?.should be_false
-  end
+    it "does not untrust returned arrays if given an trusted packed string" do
+      "".unpack(unpack_format(2)).untrusted?.should be_false
+    end
 
-  it "does not untrust returned arrays if given a untrusted packed string" do
-    packed_string = ""
-    packed_string.untrust
-    packed_string.unpack(unpack_format(2)).untrusted?.should be_false
-  end
+    it "does not untrust returned arrays if given a untrusted packed string" do
+      packed_string = ""
+      packed_string.untrust
+      packed_string.unpack(unpack_format(2)).untrusted?.should be_false
+    end
 
-  it "does not untrust returned strings if given an trusted packed string" do
-    "".unpack(unpack_format(2)).any?(&:untrusted?).should be_false
-  end
+    it "does not untrust returned strings if given an trusted packed string" do
+      "".unpack(unpack_format(2)).any?(&:untrusted?).should be_false
+    end
 
-  it "untrusts returned strings if given a untrusted packed string" do
-    packed_string = ""
-    packed_string.untrust
-    packed_string.unpack(unpack_format(2)).all?(&:untrusted?).should be_true
+    it "untrusts returned strings if given a untrusted packed string" do
+      packed_string = ""
+      packed_string.untrust
+      packed_string.unpack(unpack_format(2)).all?(&:untrusted?).should be_true
+    end
   end
 end