From 9e3db14fa2ed447064bb8893fc9a88def9217703 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 5 Nov 2025 14:30:42 +0900 Subject: [PATCH] Deprecate constant `Id` `$Id$` is for RCS, CVS, and SVN; no information with GIT. --- ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java | 1 + ext/strscan/strscan.c | 1 + test/strscan/test_stringscanner.rb | 5 ----- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java b/ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java index 03a496ae50..734288132b 100644 --- a/ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java +++ b/ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java @@ -100,6 +100,7 @@ public static RubyClass createScannerClass(final Ruby runtime) { RubyString id = runtime.newString("$Id$"); id.setFrozen(true); scannerClass.setConstant(context, "Id", id); + scannerClass.deprecateConstant(context, "Id"); scannerClass.defineAnnotatedMethods(RubyStringScanner.class); diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index 5cb14e88af..052a56e6ad 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -2226,6 +2226,7 @@ Init_strscan(void) tmp = rb_str_new2("$Id$"); rb_obj_freeze(tmp); rb_const_set(StringScanner, rb_intern("Id"), tmp); + rb_deprecate_constant(StringScanner, "Id"); rb_define_alloc_func(StringScanner, strscan_s_allocate); rb_define_private_method(StringScanner, "initialize", strscan_initialize, -1); diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb index 8218e5b6be..dd3663ea6a 100644 --- a/test/strscan/test_stringscanner.rb +++ b/test/strscan/test_stringscanner.rb @@ -107,11 +107,6 @@ def test_const_Version assert_equal(true, StringScanner::Version.frozen?) end - def test_const_Id - assert_instance_of(String, StringScanner::Id) - assert_equal(true, StringScanner::Id.frozen?) - end - def test_inspect str = 'test string'.dup s = create_string_scanner(str, false)