Revert "Merge pull request #1672 from ParadoxV5/string"

This reverts commit 4eb84e2, reversing changes made to bcf179c.
ruby · Dec 20, 2023 · 2bba474 · 2bba474
1 parent 9d5a6e0
commit 2bba474
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git 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
@@ -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