re2 2.18.0 → 2.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca6fd51cf9cb6fdf30588bbb1687a22ab681cc18cb2563c5a50af19e5d8003b7
-  data.tar.gz: 67df63ae84d4125095ec4914c8c535b93ccf143dbed794be861fc5f13005ea5e
+  metadata.gz: 687a91fb04d7c8f6d5082fd85a53b8cc08d57207dc2dd73a9d2de7ddc5700094
+  data.tar.gz: 0f2be0a7f418f1dc21bec364b8464b1e7afbd849ef51dd6fcbbdf9795afad302
 SHA512:
-  metadata.gz: c0e1997c88c7cf0a282be9d33744622827d22f6bb5c9447aaba5286a3716897af4e892cd93cf9da8addc7703cf66e4fade1dcf63572c09ffa1e1e409d3b8817d
-  data.tar.gz: f63e04163403daff714d2d9be8955902462488e85ce3531e2f5f5efceac66860d29bd1dcb8a500c1ddf95cdc15b81fc31357958a336d3c6f818c5d091abb1d4c
+  metadata.gz: c084f2d6e64dece6fa322d22217bc40cfc82ce9f25360c0e69accf1c22e633a072d8d162698d98f1cc8e5caa6f23bed5843dfbe3f1e0d88f3fe5b92df68edaf3
+  data.tar.gz: ab17cd9b2443fb6717d8f6995254cf1547af83914ef9e0ce7c34e5babb8639f04157d6c6239da45b59e5b30a1b014b136dc4945a6ce5a4fe02112e691c159e51

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.18.0  
-**Bundled RE2 version:** libre2.11 (2025-07-22)  
+**Current version:** 2.19.1  
+**Bundled RE2 version:** libre2.11 (2025-08-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-07-22)
+* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2025-08-05)
 
 ### Native gems
 
@@ -281,18 +281,18 @@ Where possible, a pre-compiled native gem will be provided for the following pla
 SHA256 checksums are included in the [release notes](https://github.com/mudge/re2/releases) for each version and can be checked with `sha256sum`, e.g.
 
 ```console
-$ gem fetch re2 -v 2.17.0
-Fetching re2-2.17.0-arm64-darwin.gem
-Downloaded re2-2.17.0-arm64-darwin
-$ sha256sum re2-2.17.0-arm64-darwin.gem
-77b44893953a95b7804d83a5d7fd88ac1a7dc49b4e559eb46f69027e93f14cd1  re2-2.17.0-arm64-darwin.gem
+$ gem fetch re2 -v 2.18.0
+Fetching re2-2.18.0-arm64-darwin.gem
+Downloaded re2-2.18.0-arm64-darwin
+$ sha256sum re2-2.18.0-arm64-darwin.gem
+953063f0491420163d3484ed256fe2ff616c777ec66ee20aa5ec1a1a1fc39ff5  re2-2.18.0-arm64-darwin.gem
 ```
 
 [GPG](https://www.gnupg.org/) signatures are attached to each release (the assets ending in `.sig`) and can be verified if you import [our signing key `0x39AC3530070E0F75`](https://mudge.name/39AC3530070E0F75.asc) (or fetch it from a public keyserver, e.g. `gpg --keyserver keyserver.ubuntu.com --recv-key 0x39AC3530070E0F75`):
 
 ```console
-$ gpg --verify re2-2.17.0-arm64-darwin.gem.sig re2-2.17.0-arm64-darwin.gem
-gpg: Signature made Fri 18 Jul 17:45:13 2025 BST
+$ gpg --verify re2-2.18.0-arm64-darwin.gem.sig re2-2.18.0-arm64-darwin.gem
+gpg: Signature made Sun  3 Aug 11:02:26 2025 BST
 gpg:                using RSA key 702609D9C790F45B577D7BEC39AC3530070E0F75
 gpg: Good signature from "Paul Mucur <mudge@mudge.name>" [unknown]
 gpg:                 aka "Paul Mucur <paul@ghostcassette.com>" [unknown]

data/Rakefile

@@ -70,9 +70,13 @@ namespace :gem do
     desc "Compile and build native gem for #{platform} platform"
     task platform do
       RakeCompilerDock.sh <<~SCRIPT, platform: platform, verbose: true
+        wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null &&
+        echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null &&
+        sudo apt-get update &&
+        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-07-22'
-  sha256: f54c29f1c3e13e12693e3d6d1230554df3ab3a1066b2e1f28c5330bfbf6db1e3
+  version: '2025-08-05'
+  sha256: b5708d8388110624c85f300e7e9b39c4ed5469891eb1127dd7f9d61272d04907
 abseil:
   version: '20250127.1'
   sha256: b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811

data/ext/re2/re2.cc

@@ -136,14 +136,13 @@ 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);
 }
 
 #ifdef HAVE_RB_GC_MARK_MOVABLE
 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);
 }
 #endif
 
@@ -183,14 +182,13 @@ 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);
 }
 
 #ifdef HAVE_RB_GC_MARK_MOVABLE
 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);
 }
 #endif
 
@@ -290,9 +288,11 @@ 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}.
  *
+ * If the text was already a frozen string, returns the original.
+ *
  * @return [String] the original string passed to {RE2::Regexp#scan}
  * @example
  *   c = RE2::Regexp.new('(\d+)').scan("foo")
@@ -1534,10 +1534,7 @@ static VALUE re2_regexp_match(int argc, VALUE *argv, const VALUE self) {
     TypedData_Get_Struct(matchdata, re2_matchdata, &re2_matchdata_data_type, m);
     m->matches = new(std::nothrow) re2::StringPiece[n];
     RB_OBJ_WRITE(matchdata, &m->regexp, self);
-    if (!RTEST(rb_obj_frozen_p(text))) {
-      text = rb_str_freeze(rb_str_dup(text));
-    }
-    RB_OBJ_WRITE(matchdata, &m->text, text);
+    RB_OBJ_WRITE(matchdata, &m->text, rb_str_new_frozen(text));
 
     if (m->matches == 0) {
       rb_raise(rb_eNoMemError,
@@ -1626,10 +1623,10 @@ 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);
-  RB_OBJ_WRITE(scanner, &c->text, text);
+  RB_OBJ_WRITE(scanner, &c->text, rb_str_new_frozen(text));
+  c->input = new(std::nothrow) re2::StringPiece(
+      RSTRING_PTR(c->text), RSTRING_LEN(c->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.18.0"
+  VERSION = "2.19.1"
 end

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,15 @@ RSpec.describe RE2::Scanner do
       expect(scanner.scan).to eq(["world"])
       expect(scanner.scan).to be_nil
     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.18.0
+  version: 2.19.1
 platform: ruby
 authors:
 - Paul Mucur
@@ -89,7 +89,7 @@ files:
 - lib/re2/string.rb
 - lib/re2/version.rb
 - ports/archives/20250127.1.tar.gz
-- ports/archives/re2-2025-07-22.tar.gz
+- ports/archives/re2-2025-08-05.tar.gz
 - re2.gemspec
 - spec/kernel_spec.rb
 - spec/re2/match_data_spec.rb