From c9cb17fab28419350ca854bec69c74530b20076c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 7 Feb 2026 22:51:02 +0900 Subject: [PATCH 1/2] Omit version check of Unicode headers These headers are stored in directories labeled with the current Unicode version, so no worry about headers for different versions being mixed together. --- common.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/common.mk b/common.mk index 7081b7d4b28b9f..0c62784971b95d 100644 --- a/common.mk +++ b/common.mk @@ -940,14 +940,6 @@ rbconfig.rb: $(RBCONFIG) $(HAVE_BASERUBY:no=)$(RBCONFIG)$(HAVE_BASERUBY:no=): $(PREP) $(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h $(srcdir)/common.mk -$(RBCONFIG): unicode-version - -unicode-version: - $(Q)$(BOOTSTRAPRUBY) -n \ - -e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \ - -e 'END{abort "UNICODE version mismatch: #{mis}" unless mis.empty?}' \ - -e '(mis.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(version)}"/o' \ - $(UNICODE_VERSION) $(UNICODE_DATA_HEADERS) $(RBCONFIG): $(Q)$(BOOTSTRAPRUBY) $(tooldir)/mkconfig.rb \ From 1f0fc3da7090977110d8d64d2ad69bfa3f5cc584 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 5 Feb 2026 20:06:42 -0500 Subject: [PATCH 2/2] Remove dead rb_darray_swap_remove --- darray.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/darray.h b/darray.h index 10fd5e4ccc7e59..2b876c9f1ef693 100644 --- a/darray.h +++ b/darray.h @@ -73,20 +73,6 @@ (*(ptr_to_ary))->meta.size++; \ } while (0) -/* Removes the element at idx and replaces it with the last element. - * ptr_to_ary and idx is evaluated multiple times. - * Warning: not bounds checked. - * - * void rb_darray_swap_remove(rb_darray(T) *ptr_to_ary, size_t idx); - */ -#define rb_darray_swap_remove(ptr_to_ary, idx) do { \ - size_t _darray_size = rb_darray_size(*(ptr_to_ary)); \ - if ((idx) != _darray_size - 1) { \ - (*(ptr_to_ary))->data[idx] = (*(ptr_to_ary))->data[_darray_size - 1]; \ - } \ - (*(ptr_to_ary))->meta.size--; \ -} while (0) - // Iterate over items of the array in a for loop // #define rb_darray_foreach(ary, idx_name, elem_ptr_var) \