From 7d7dda8e1350dbfc508cdcea28a42f9b7aa5b7b6 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Tue, 4 Nov 2025 13:28:00 -0800
Subject: [PATCH] Resurrect a method that has not been obsolete

Partially revert https://github.com/ruby/strscan/pull/168 because
strscan_rest_p did not have rb_warning("StringScanner#rest? is obsolete").

It is actively used by the latest tzinfo.gem, and we shouldn't remove it
without deprecating it.
---
 ext/strscan/strscan.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index b141461121..7e951855d4 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -122,6 +122,7 @@ static VALUE strscan_scan_base10_integer _((VALUE self));
 static VALUE strscan_unscan _((VALUE self));
 static VALUE strscan_bol_p _((VALUE self));
 static VALUE strscan_eos_p _((VALUE self));
+static VALUE strscan_rest_p _((VALUE self));
 static VALUE strscan_matched_p _((VALUE self));
 static VALUE strscan_matched _((VALUE self));
 static VALUE strscan_matched_size _((VALUE self));
@@ -1471,6 +1472,29 @@ strscan_eos_p(VALUE self)
     return EOS_P(p) ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq:
+ *   rest?
+ *
+ * Returns true if and only if there is more data in the string.  See #eos?.
+ * This method is obsolete; use #eos? instead.
+ *
+ *   s = StringScanner.new('test string')
+ *   # These two are opposites
+ *   s.eos? # => false
+ *   s.rest? # => true
+ */
+
+ /* :nodoc: */
+static VALUE
+strscan_rest_p(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    return EOS_P(p) ? Qfalse : Qtrue;
+}
+
 /*
  * :markup: markdown
  * :include: strscan/link_refs.txt
@@ -2237,6 +2261,7 @@ Init_strscan(void)
     rb_define_method(StringScanner, "beginning_of_line?", strscan_bol_p, 0);
     rb_alias(StringScanner, rb_intern("bol?"), rb_intern("beginning_of_line?"));
     rb_define_method(StringScanner, "eos?",        strscan_eos_p,       0);
+    rb_define_method(StringScanner, "rest?",       strscan_rest_p,      0);
 
     rb_define_method(StringScanner, "matched?",    strscan_matched_p,   0);
     rb_define_method(StringScanner, "matched",     strscan_matched,     0);