1 files changed, 8 insertions, 35 deletions
diff --git a/spec/ruby/core/string/shared/replace.rb b/spec/ruby/core/string/shared/replace.rb
index 9f5446fbbe..24dac0eb27 100644
--- a/spec/ruby/core/string/shared/replace.rb
+++ b/spec/ruby/core/string/shared/replace.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 describe :string_replace, shared: true do
   it "returns self" do
     a = "a"
@@ -10,34 +11,6 @@ describe :string_replace, shared: true do
     a.should == "another string"
   end
 
-  it "taints self if other is tainted" do
-    a = ""
-    b = "".taint
-    a.send(@method, b)
-    a.tainted?.should == true
-  end
-
-  it "does not untaint self if other is untainted" do
-    a = "".taint
-    b = ""
-    a.send(@method, b)
-    a.tainted?.should == true
-  end
-
-  it "untrusts self if other is untrusted" do
-    a = ""
-    b = "".untrust
-    a.send(@method, b)
-    a.untrusted?.should == true
-  end
-
-  it "does not trust self if other is trusted" do
-    a = "".untrust
-    b = ""
-    a.send(@method, b)
-    a.untrusted?.should == true
-  end
-
   it "replaces the encoding of self with that of other" do
     a = "".encode("UTF-16LE")
     b = "".encode("UTF-8")
@@ -57,19 +30,19 @@ describe :string_replace, shared: true do
   end
 
   it "raises a TypeError if other can't be converted to string" do
-    lambda { "hello".send(@method, 123)       }.should raise_error(TypeError)
-    lambda { "hello".send(@method, [])        }.should raise_error(TypeError)
-    lambda { "hello".send(@method, mock('x')) }.should raise_error(TypeError)
+    -> { "hello".send(@method, 123)       }.should raise_error(TypeError)
+    -> { "hello".send(@method, [])        }.should raise_error(TypeError)
+    -> { "hello".send(@method, mock('x')) }.should raise_error(TypeError)
   end
 
-  it "raises a RuntimeError on a frozen instance that is modified" do
+  it "raises a FrozenError on a frozen instance that is modified" do
     a = "hello".freeze
-    lambda { a.send(@method, "world") }.should raise_error(RuntimeError)
+    -> { a.send(@method, "world") }.should raise_error(FrozenError)
   end
 
   # see [ruby-core:23666]
-  it "raises a RuntimeError on a frozen instance when self-replacing" do
+  it "raises a FrozenError on a frozen instance when self-replacing" do
     a = "hello".freeze
-    lambda { a.send(@method, a) }.should raise_error(RuntimeError)
+    -> { a.send(@method, a) }.should raise_error(FrozenError)
   end
 end