re2 2.20.0-arm-linux-gnu → 2.21.0-arm-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c555471dc7670270c41ca2c9300ac65046a727ccf100769afbb4823d85f8a516
-  data.tar.gz: c54320303592ee06c0dd4a751f638af0393f2877f6c52a7d1d55e6a1524a618d
+  metadata.gz: dbdd9a1a46ac6e196b2bbf90e31684c9559f87d9ab4febad73a5f4cf34c9ed77
+  data.tar.gz: 44e9874ed9f6e4454d5707144553d1abd79be711fdfcea9727bb2480179d9924
 SHA512:
-  metadata.gz: 7de55fe855eed892a79ded0d4eeabc6a464f9fa7aad13f1c708908e6cd4bca48947cfe362fe45ea9f810a60268d91cf8d976634e857bf8c19c15db9cc0f79f27
-  data.tar.gz: 4a3dfc372920eb8e87d930ca0050f034d3aff5d9135d6150ae76f6fdff12badd6d9e73e99aa36c8ad935adf5f281bce793338c11afee74d6b3b06c26752ab8bc
+  metadata.gz: 283e6f9ae2614b8ac86d0dda2fcb8b3f24f52ea4a0bfd1a0abfef467a5aed358408adc8718ae35357c885b39e8e197a39129556d9e07bc69c1d9ff19b05a2ecf
+  data.tar.gz: 6b98326df023569622d7906f1a4b7e83a2a8c0038413aaad6cc9ea2f1200f6340adb927313818c600bbe84ebcae3a7d2819cc7d773e9c82a9458993c00aad437

data/README.md

@@ -6,8 +6,8 @@ Python".
 
 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/mudge/re2/actions)
 
-**Current version:** 2.20.0  
-**Bundled RE2 version:** libre2.11 (2025-08-12)  
+**Current version:** 2.21.0  
+**Bundled RE2 version:** libre2.11 (2025-11-05)  
 
 ```ruby
 RE2('h.*o').full_match?("hello")    #=> true
@@ -264,7 +264,7 @@ This gem requires the following to run:
 
 It supports the following RE2 ABI versions:
 
-* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2025-08-12)
+* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2025-11-05)
 
 ### Native gems
 
@@ -378,6 +378,8 @@ Alternatively, you can set the `RE2_USE_SYSTEM_LIBRARIES` environment variable i
   improvements in 2.4.0.
 * Thanks to [Manuel Jacob](https://github.com/manueljacob) for reporting a bug
   when passing strings with null bytes.
+* Thanks to [Maciej Gajewski](https://github.com/konieczkow) for helping
+  confirm issues with GC compaction and mutable strings.
 
 ## Contact
 

data/Rakefile

@@ -76,7 +76,7 @@ namespace :gem do
         sudo apt-get install -y cmake=3.22.2-0kitware1ubuntu20.04.1 cmake-data=3.22.2-0kitware1ubuntu20.04.1 &&
         rbenv shell 3.1.6 &&
         gem install bundler --no-document &&
-        bundle &&
+        bundle install &&
         bundle exec rake native:#{platform} pkg/#{re2_gemspec.full_name}-#{Gem::Platform.new(platform)}.gem PATH="/usr/local/bin:$PATH"
       SCRIPT
     end

data/dependencies.yml

@@ -1,7 +1,7 @@
 ---
 libre2:
-  version: '2025-08-12'
-  sha256: 2f3bec634c3e51ea1faf0d441e0a8718b73ef758d7020175ed7e352df3f6ae12
+  version: '2025-11-05'
+  sha256: 87f6029d2f6de8aa023654240a03ada90e876ce9a4676e258dd01ea4c26ffd67
 abseil:
   version: '20250814.1'
   sha256: 1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1

data/ext/re2/re2.cc

@@ -128,13 +128,12 @@ static void parse_re2_options(RE2::Options* re2_options, const VALUE options) {
 static void re2_matchdata_mark(void *ptr) {
   re2_matchdata *m = reinterpret_cast<re2_matchdata *>(ptr);
   rb_gc_mark_movable(m->regexp);
-  rb_gc_mark_movable(m->text);
+  rb_gc_mark(m->text);
 }
 
 static void re2_matchdata_compact(void *ptr) {
   re2_matchdata *m = reinterpret_cast<re2_matchdata *>(ptr);
   m->regexp = rb_gc_location(m->regexp);
-  m->text = rb_gc_location(m->text);
 }
 
 static void re2_matchdata_free(void *ptr) {
@@ -173,13 +172,12 @@ static const rb_data_type_t re2_matchdata_data_type = {
 static void re2_scanner_mark(void *ptr) {
   re2_scanner *s = reinterpret_cast<re2_scanner *>(ptr);
   rb_gc_mark_movable(s->regexp);
-  rb_gc_mark_movable(s->text);
+  rb_gc_mark(s->text);
 }
 
 static void re2_scanner_compact(void *ptr) {
   re2_scanner *s = reinterpret_cast<re2_scanner *>(ptr);
   s->regexp = rb_gc_location(s->regexp);
-  s->text = rb_gc_location(s->text);
 }
 
 static void re2_scanner_free(void *ptr) {
@@ -278,10 +276,12 @@ static VALUE re2_matchdata_string(const VALUE self) {
 }
 
 /*
- * Returns the text supplied when incrementally matching with
+ * Returns a frozen copy of the text supplied when incrementally matching with
  * {RE2::Regexp#scan}.
  *
- * @return [String] the original string passed to {RE2::Regexp#scan}
+ * If the text was already a frozen string, returns the original.
+ *
+ * @return [String] a frozen string with the text passed to {RE2::Regexp#scan}
  * @example
  *   c = RE2::Regexp.new('(\d+)').scan("foo")
  *   c.string #=> "foo"
@@ -1614,10 +1614,13 @@ static VALUE re2_regexp_scan(const VALUE self, VALUE text) {
   VALUE scanner = rb_class_new_instance(0, 0, re2_cScanner);
   TypedData_Get_Struct(scanner, re2_scanner, &re2_scanner_data_type, c);
 
-  c->input = new(std::nothrow) re2::StringPiece(
-      RSTRING_PTR(text), RSTRING_LEN(text));
   RB_OBJ_WRITE(scanner, &c->regexp, self);
+  if (!RTEST(rb_obj_frozen_p(text))) {
+    text = rb_str_freeze(rb_str_dup(text));
+  }
   RB_OBJ_WRITE(scanner, &c->text, text);
+  c->input = new(std::nothrow) re2::StringPiece(
+      RSTRING_PTR(text), RSTRING_LEN(text));
 
   if (p->pattern->ok()) {
     c->number_of_capturing_groups = p->pattern->NumberOfCapturingGroups();

data/lib/re2/version.rb

@@ -10,5 +10,5 @@
 
 
 module RE2
-  VERSION = "2.20.0"
+  VERSION = "2.21.0"
 end

data/spec/re2/match_data_spec.rb

@@ -133,6 +133,13 @@ RSpec.describe RE2::MatchData do
       expect(md["name"].encoding.name).to eq("ISO-8859-1")
       expect(md[:name].encoding.name).to eq("ISO-8859-1")
     end
+
+    it "supports GC compaction" do
+      md = RE2::Regexp.new('(wo{2})').match('woohoo' * 5)
+      GC.compact
+
+      expect(md[1]).to eq("woo")
+    end
   end
 
   describe "#string" do
@@ -287,6 +294,13 @@ RSpec.describe RE2::MatchData do
 
       expect { md.begin(nil) }.to raise_error(TypeError)
     end
+
+    it "supports GC compaction" do
+      md = RE2::Regexp.new('(wo{2})').match('woohoo' * 5)
+      GC.compact
+
+      expect(md.string[md.begin(0)..-1]).to eq('woohoo' * 5)
+    end
   end
 
   describe "#end" do
@@ -349,6 +363,13 @@ RSpec.describe RE2::MatchData do
 
       expect { md.end(nil) }.to raise_error(TypeError)
     end
+
+    it "supports GC compaction" do
+      md = RE2::Regexp.new('(wo{2})').match('woohoo' * 5)
+      GC.compact
+
+      expect(md.string[0...md.end(0)]).to eq('woo')
+    end
   end
 
   describe "#deconstruct" do

data/spec/re2/scanner_spec.rb

@@ -11,7 +11,39 @@ RSpec.describe RE2::Scanner do
   end
 
   describe "#string" do
-    it "returns the original text for the scanner" do
+    it "returns the text for the scanner" do
+      re = RE2::Regexp.new('(\w+)')
+      text = "It is a truth"
+      scanner = re.scan(text)
+
+      expect(scanner.string).to eq("It is a truth")
+    end
+
+    it "returns a frozen string" do
+      re = RE2::Regexp.new('(\w+)')
+      text = "It is a truth"
+      scanner = re.scan(text)
+
+      expect(scanner.string).to be_frozen
+    end
+
+    it "freezes unfrozen strings" do
+      re = RE2::Regexp.new('(\w+)')
+      text = +"It is a truth"
+      scanner = re.scan(text)
+
+      expect(scanner.string).to be_frozen
+    end
+
+    it "copies unfrozen strings" do
+      re = RE2::Regexp.new('(\w+)')
+      text = +"It is a truth"
+      scanner = re.scan(text)
+
+      expect(scanner.string).to_not equal(text)
+    end
+
+    it "does not copy the string if it was already frozen" do
       re = RE2::Regexp.new('(\w+)')
       text = "It is a truth"
       scanner = re.scan(text)
@@ -162,6 +194,23 @@ RSpec.describe RE2::Scanner do
       expect(scanner.scan).to eq(["world"])
       expect(scanner.scan).to be_nil
     end
+
+    it "supports GC compaction" do
+      r = RE2::Regexp.new('(\w+)')
+      scanner = r.scan("Hello world" * 2)
+      GC.compact
+
+      expect(scanner.scan).to eq(["Hello"])
+    end
+
+    it "works even if the original input is mutated" do
+      r = RE2::Regexp.new('(\w+)')
+      text = +"It is a truth universally acknowledged"
+      scanner = r.scan(text)
+      text.upcase!
+
+      expect(scanner.scan).to eq(["It"])
+    end
   end
 
   it "is enumerable" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.21.0
 platform: arm-linux-gnu
 authors:
 - Paul Mucur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-09-26 00:00:00.000000000 Z
+date: 2025-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler