From 2bba47432d5b8c2f442aa3905b154e18fd4a181e Mon Sep 17 00:00:00 2001
From: Soutaro Matsumoto <matsumoto@soutaro.com>
Date: Wed, 20 Dec 2023 11:28:35 +0900
Subject: [PATCH] Revert "Merge pull request #1672 from ParadoxV5/string"

This reverts commit 4eb84e2c154dd662ce4e8ce33cfb4c71ac6f0f21, reversing
changes made to bcf179ccb13fa39c902f1263d4d70f1d0b4e436a.
---
 core/string.rbs            |  3 +--
 test/stdlib/String_test.rb | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/core/string.rbs b/core/string.rbs
index c956034bb..d11ecb218 100644
--- a/core/string.rbs
+++ b/core/string.rbs
@@ -1349,7 +1349,6 @@ class String
   # modification made, `self` otherwise.
   #
   def chomp!: (nil) -> nil
-          # | (?string separator) -> self? # https://github.com/ruby/rbs/pull/1672#discussion_r1423324796
             | (?string? separator) -> self?
 
   # <!--
@@ -2742,7 +2741,7 @@ class String
   #     "\x81"
   #     "\x81"
   #
-  def scrub: (?string? replacement) -> String
+  def scrub: (?string replacement) -> String
            | (?nil) { (String bytes) -> string } -> String
 
   # <!--
diff --git a/test/stdlib/String_test.rb b/test/stdlib/String_test.rb
index a3338e89a..236c17143 100644
--- a/test/stdlib/String_test.rb
+++ b/test/stdlib/String_test.rb
@@ -1281,11 +1281,6 @@ def test_scrub
     assert_send_type  '() -> String',
                       invalid, :scrub
 
-    assert_send_type  '(nil) -> String',
-                      valid, :scrub, nil
-    assert_send_type  '(nil) -> String',
-                      invalid, :scrub, nil
-
     with_string '&' do |replacement|
       assert_send_type  '(string) -> String',
                         valid, :scrub, replacement
@@ -1315,11 +1310,6 @@ def test_scrub!
     assert_send_type  '() -> String',
                       invalid.dup, :scrub!
 
-    assert_send_type  '(nil) -> String',
-                      valid.dup, :scrub!, nil
-    assert_send_type  '(nil) -> String',
-                      invalid.dup, :scrub!, nil
-
     with_string '&' do |replacement|
       assert_send_type  '(string) -> String',
                         valid.dup, :scrub!, replacement