[pull] master from ruby:master

.github/workflows/sync_default_gems.yml

@@ -32,6 +32,11 @@ jobs:
         with:
           token: ${{ github.repository == 'ruby/ruby' && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
 
+      - uses: ruby/setup-ruby@ab177d40ee5483edb974554986f56b33477e21d0 # v1.265.0
+        with:
+          ruby-version: '3.4'
+          bundler: none
+
       - name: Run tool/sync_default_gems.rb
         id: sync
         run: |

ext/strscan/extconf.rb

@@ -4,6 +4,7 @@
   $INCFLAGS << " -I$(top_srcdir)" if $extmk
   have_func("onig_region_memsize(NULL)")
   have_func("rb_reg_onig_match", "ruby/re.h")
+  have_func("rb_deprecate_constant")
   create_makefile 'strscan'
 else
   File.write('Makefile', dummy_makefile("").join)

ext/strscan/strscan.c

@@ -24,6 +24,14 @@ extern size_t onig_region_memsize(const struct re_registers *regs);
 
 #define STRSCAN_VERSION "3.1.6.dev"
 
+
+#ifdef HAVE_RB_DEPRECATE_CONSTANT
+/* In ruby 3.0, defined but exposed in external headers */
+extern void rb_deprecate_constant(VALUE mod, const char *name);
+#else
+# define rb_deprecate_constant(mod, name) ((void)0)
+#endif
+
 /* =======================================================================
                          Data Type Definitions
    ======================================================================= */
@@ -1274,7 +1282,7 @@ static VALUE
 strscan_scan_base10_integer(VALUE self)
 {
     char *ptr;
-    long len = 0;
+    long len = 0, remaining_len;
     struct strscanner *p;
 
     GET_SCANNER(self, p);
@@ -1284,7 +1292,7 @@ strscan_scan_base10_integer(VALUE self)
 
     ptr = CURPTR(p);
 
-    long remaining_len = S_RESTLEN(p);
+    remaining_len = S_RESTLEN(p);
 
     if (remaining_len <= 0) {
         return Qnil;
@@ -1311,7 +1319,7 @@ static VALUE
 strscan_scan_base16_integer(VALUE self)
 {
     char *ptr;
-    long len = 0;
+    long len = 0, remaining_len;
     struct strscanner *p;
 
     GET_SCANNER(self, p);
@@ -1321,7 +1329,7 @@ strscan_scan_base16_integer(VALUE self)
 
     ptr = CURPTR(p);
 
-    long remaining_len = S_RESTLEN(p);
+    remaining_len = S_RESTLEN(p);
 
     if (remaining_len <= 0) {
         return Qnil;
@@ -1477,7 +1485,6 @@ strscan_eos_p(VALUE self)
  *   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
@@ -1605,7 +1612,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
                                               (const unsigned char* )name_end,
                                               regs);
         if (num >= 1) {
-	        return num;
+	    return num;
         }
     }
     rb_enc_raise(enc, rb_eIndexError, "undefined group name reference: %.*s",
@@ -2211,6 +2218,7 @@ Init_strscan(void)
     ScanError = rb_define_class_under(StringScanner, "Error", rb_eStandardError);
     if (!rb_const_defined(rb_cObject, id_scanerr)) {
 	rb_const_set(rb_cObject, id_scanerr, ScanError);
+	rb_deprecate_constant(rb_cObject, "ScanError");
     }
     tmp = rb_str_new2(STRSCAN_VERSION);
     rb_obj_freeze(tmp);

pathname_builtin.rb

@@ -217,7 +217,8 @@ class Pathname
   def initialize(path)
     unless String === path
       path = path.to_path if path.respond_to? :to_path
-      raise TypeError unless String === path
+      path = path.to_str if path.respond_to? :to_str
+      raise TypeError, "Pathname.new requires a String, #to_path or #to_str" unless String === path
     end
 
     if path.include?("\0")

spec/ruby/library/stringscanner/unscan_spec.rb

@@ -21,8 +21,8 @@
     @s.pos.should == pos
   end
 
-  it "raises a ScanError when the previous match had failed" do
-    -> { @s.unscan }.should raise_error(ScanError)
-    -> { @s.scan(/\d/); @s.unscan }.should raise_error(ScanError)
+  it "raises a StringScanner::Error when the previous match had failed" do
+    -> { @s.unscan }.should raise_error(StringScanner::Error)
+    -> { @s.scan(/\d/); @s.unscan }.should raise_error(StringScanner::Error)
   end
 end

test/pathname/test_pathname.rb

@@ -484,6 +484,10 @@ def test_initialize
     assert_equal('a', p1.to_s)
     p2 = Pathname.new(p1)
     assert_equal(p1, p2)
+
+    obj = Object.new
+    def obj.to_str; "a/b"; end
+    assert_equal("a/b", Pathname.new(obj).to_s)
   end
 
   def test_initialize_nul

test/strscan/test_stringscanner.rb

@@ -875,7 +875,7 @@ def test_unscan
     assert_equal({}, s.named_captures)
     assert_equal("te", s.scan(/../))
     assert_equal(nil, s.scan(/\d/))
-    assert_raise(ScanError) { s.unscan }
+    assert_raise(StringScanner::Error) { s.unscan }
   end
 
   def test_rest