re2 2.19.0-arm64-darwin → 2.21.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e00645b93a4fd3c1483ef68011c39cfba80717ddca91b4a4e96a1dc9554837
-  data.tar.gz: 151f856b26b4417330c1fe8689158f9cdedb3022ca00b5c864214c7a8a29b3ac
+  metadata.gz: dd576e129dd44bf28fefa5c64eca375ee9e5fc5f3d1c26ec7fb1b3ddee7b7935
+  data.tar.gz: 24f7560f116cd88477f4e55b0429537f549ac419b5c703a913f4c5fb372d89c7
 SHA512:
-  metadata.gz: ce9ea8392a44fb1e03dce6381c5bee41f64b2aa9b99a6b222289859e60dc1354ec6ff0686df77bea132a140014f04f78bcbb8164988b7ef5f162cd43107dbc91
-  data.tar.gz: 81c62bcfb363a194ab297e2e30936faad71cebd596bbdc8b98180bd0d0594787154833e2be35a8b223e0002e6e5397258ce6d97e6b81daf5a7449430d2c407ea
+  metadata.gz: 2e0bf779d544ca7bf5df5bae5c63ec0fc4e74e89d9f9ff992e89c00636d8befd19f2023c8441ee4c2838268c8cd2926c438852f2d166ce68982dec5924209b43
+  data.tar.gz: 846c5ac8c95ba69ec5ff01015fb9da9c13471a76b8a5793506d709b881adb59b9c722a180cb9f4dc36fb4c59c29033e7fd1e0abae901b93ee880aee3ce7f6001

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.19.0  
-**Bundled RE2 version:** libre2.11 (2025-08-05)  
+**Current version:** 2.21.0  
+**Bundled RE2 version:** libre2.11 (2025-11-05)  
 
 ```ruby
 RE2('h.*o').full_match?("hello")    #=> true
@@ -260,21 +260,21 @@ RE2(non_latin1_pattern.encode("ISO-8859-1"), utf8: false).match(non_latin1_text.
 
 This gem requires the following to run:
 
-* [Ruby](https://www.ruby-lang.org/en/) 2.6 to 3.4
+* [Ruby](https://www.ruby-lang.org/en/) 3.1 to 3.4
 
 It supports the following RE2 ABI versions:
 
-* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2025-08-05)
+* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2025-11-05)
 
 ### Native gems
 
 Where possible, a pre-compiled native gem will be provided for the following platforms:
 
 * Linux
-    * `aarch64-linux`, `arm-linux`, `x86-linux` and `x86_64-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.29+, RubyGems 3.3.22+ and Bundler 2.3.21+)
+    * `aarch64-linux`, `arm-linux`, and `x86_64-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.29+, RubyGems 3.3.22+ and Bundler 2.3.21+)
     * [musl](https://musl.libc.org/)-based systems such as [Alpine](https://alpinelinux.org) are supported with Bundler 2.5.6+
-* macOS `x86_64-darwin` and `arm64-darwin`
-* Windows `x64-mingw32` and `x64-mingw-ucrt`
+* macOS 10.14+ `x86_64-darwin` and `arm64-darwin`
+* Windows 2022+ `x64-mingw-ucrt`
 
 ### Verifying the gems
 
@@ -331,8 +331,8 @@ You will need a full compiler toolchain for compiling Ruby C extensions (see
 Toolchain"](https://nokogiri.org/tutorials/installing_nokogiri.html#appendix-a-the-compiler-toolchain))
 plus the toolchain required for compiling the vendored version of RE2 and its
 dependency [Abseil][] which includes [CMake](https://cmake.org), a compiler
-with C++14 support such as [clang](http://clang.llvm.org/) 3.4 or
-[gcc](https://gcc.gnu.org/) 5 and a recent version of
+with C++17 support such as [clang](http://clang.llvm.org/) 5 or
+[gcc](https://gcc.gnu.org/) 8 and a recent version of
 [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/). On
 Windows, you'll also need pkgconf 2.1.0+ to avoid [`undefined reference`
 errors](https://github.com/pkgconf/pkgconf/issues/322) when attempting to
@@ -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

@@ -33,7 +33,7 @@ cross_platforms = %w[
   x86_64-linux-musl
 ].freeze
 
-RakeCompilerDock.set_ruby_cc_version("~> 2.6", "~> 3.0")
+RakeCompilerDock.set_ruby_cc_version("~> 3.1")
 
 Gem::PackageTask.new(re2_gemspec).define
 
@@ -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-05'
-  sha256: b5708d8388110624c85f300e7e9b39c4ed5469891eb1127dd7f9d61272d04907
+  version: '2025-11-05'
+  sha256: 87f6029d2f6de8aa023654240a03ada90e876ce9a4676e258dd01ea4c26ffd67
 abseil:
-  version: '20250127.1'
-  sha256: b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811
+  version: '20250814.1'
+  sha256: 1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1

data/ext/re2/extconf.rb

@@ -103,6 +103,8 @@ module RE2
     def build_with_vendored_libraries
       message "Building re2 using packaged libraries.\n"
 
+      ENV["MACOSX_DEPLOYMENT_TARGET"] = "10.14"
+
       abseil_recipe, re2_recipe = load_recipes
 
       process_recipe(abseil_recipe) do |recipe|
@@ -129,10 +131,8 @@ module RE2
     end
 
     def build_extension
-      # Enable optional warnings but disable deprecated register warning for Ruby 2.6 support
       $CFLAGS << " -Wall -Wextra -funroll-loops"
       $CXXFLAGS << " -Wall -Wextra -funroll-loops"
-      $CPPFLAGS << " -Wno-register"
 
       # Pass -x c++ to force gcc to compile the test program
       # as C++ (as it will end in .c by default).
@@ -140,7 +140,6 @@ module RE2
 
       have_library("stdc++")
       have_header("stdint.h")
-      have_func("rb_gc_mark_movable") # introduced in Ruby 2.7
 
       minimal_program = <<~SRC
         #include <re2/re2.h>
@@ -152,13 +151,9 @@ module RE2
       end
 
       if re2_requires_version_flag
-        # Recent versions of re2 depend directly on abseil, which requires a
-        # compiler with C++14 support (see
-        # https://github.com/abseil/abseil-cpp/issues/1127 and
-        # https://github.com/abseil/abseil-cpp/issues/1431). However, the
-        # `std=c++14` flag doesn't appear to suffice; we need at least
-        # `std=c++17`.
-        abort "Cannot compile re2 with your compiler: recent versions require C++14 support." unless %w[c++20 c++17 c++11 c++0x].any? do |std|
+        # Recent versions of RE2 depend directly on Abseil, which requires a
+        # compiler with C++17 support.
+        abort "Cannot compile re2 with your compiler: recent versions require C++17 support." unless %w[c++20 c++17 c++11 c++0x].any? do |std|
           checking_for("re2 that compiles with #{std} standard") do
             if try_compile(minimal_program, compile_options + " -std=#{std}")
               compile_options << " -std=#{std}"

data/ext/re2/re2.cc

@@ -125,27 +125,16 @@ static void parse_re2_options(RE2::Options* re2_options, const VALUE options) {
   }
 }
 
-/* For compatibility with Ruby < 2.7 */
-#ifdef HAVE_RB_GC_MARK_MOVABLE
-#define re2_compact_callback(x) (x),
-#else
-#define rb_gc_mark_movable(x) rb_gc_mark(x)
-#define re2_compact_callback(x)
-#endif
-
 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
 
 static void re2_matchdata_free(void *ptr) {
   re2_matchdata *m = reinterpret_cast<re2_matchdata *>(ptr);
@@ -171,7 +160,7 @@ static const rb_data_type_t re2_matchdata_data_type = {
     re2_matchdata_mark,
     re2_matchdata_free,
     re2_matchdata_memsize,
-    re2_compact_callback(re2_matchdata_compact)
+    re2_matchdata_compact
   },
   0,
   0,
@@ -183,16 +172,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
 
 static void re2_scanner_free(void *ptr) {
   re2_scanner *s = reinterpret_cast<re2_scanner *>(ptr);
@@ -218,7 +204,7 @@ static const rb_data_type_t re2_scanner_data_type = {
     re2_scanner_mark,
     re2_scanner_free,
     re2_scanner_memsize,
-    re2_compact_callback(re2_scanner_compact)
+    re2_scanner_compact
   },
   0,
   0,
@@ -290,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"
@@ -1626,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/ext/re2/recipes.rb

@@ -9,7 +9,7 @@
 # Released under the BSD Licence, please see LICENSE.txt
 
 PACKAGE_ROOT_DIR = File.expand_path('../..', __dir__)
-REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.7' # keep this version in sync with the one in the gemspec
+REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.9' # keep this version in sync with the one in the gemspec
 
 def load_recipes
   require 'yaml'
@@ -40,8 +40,8 @@ def build_recipe(name, version)
   MiniPortileCMake.new(name, version).tap do |recipe|
     recipe.target = File.join(PACKAGE_ROOT_DIR, 'ports')
     recipe.configure_options += [
-      # abseil needs a C++14 compiler
-      '-DCMAKE_CXX_STANDARD=14',
+      # abseil needs a C++17 compiler
+      '-DCMAKE_CXX_STANDARD=17',
       # needed for building the C extension shared library with -fPIC
       '-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
       # ensures pkg-config and installed libraries will be in lib, not lib64

data/lib/re2/version.rb

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

data/re2.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/mudge/re2"
   s.extensions = ["ext/re2/extconf.rb"]
   s.license = "BSD-3-Clause"
-  s.required_ruby_version = ">= 2.6.0"
+  s.required_ruby_version = ">= 3.1.0"
   s.files = [
     "dependencies.yml",
     "ext/re2/extconf.rb",
@@ -40,8 +40,8 @@ Gem::Specification.new do |s|
     "spec/re2/set_spec.rb",
     "spec/re2/scanner_spec.rb"
   ]
-  s.add_development_dependency("rake-compiler", "~> 1.2.7")
+  s.add_development_dependency("rake-compiler", "~> 1.3.0")
   s.add_development_dependency("rake-compiler-dock", "~> 1.9.1")
   s.add_development_dependency("rspec", "~> 3.2")
-  s.add_runtime_dependency("mini_portile2", "~> 2.8.7") # keep version in sync with extconf.rb
+  s.add_runtime_dependency("mini_portile2", "~> 2.8.9") # keep version in sync with extconf.rb
 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.19.0
+  version: 2.21.0
 platform: arm64-darwin
 authors:
 - Paul Mucur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-08-07 00:00:00.000000000 Z
+date: 2025-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
@@ -70,9 +70,6 @@ files:
 - ext/re2/extconf.rb
 - ext/re2/re2.cc
 - ext/re2/recipes.rb
-- lib/2.6/re2.bundle
-- lib/2.7/re2.bundle
-- lib/3.0/re2.bundle
 - lib/3.1/re2.bundle
 - lib/3.2/re2.bundle
 - lib/3.3/re2.bundle
@@ -103,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.5.dev