Skip to content

[pull] master from ruby:master #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Feb 7, 2026
Merged

[pull] master from ruby:master #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9cb17f
Omit version check of Unicode headers
nobu Feb 7, 2026
1f0fc3d
Remove dead rb_darray_swap_remove
peterzhu2118 Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
14 changes: 0 additions & 14 deletions darray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down