Skip to content

[pull] master from ruby:master #1409

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Sep 14, 2026
Merged

[pull] master from ruby:master #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
228f613
string.c: Further String#tr fixes and refactors
byroot Sep 14, 2026
f30fdb0
Update bundled gems list as of 2026-09-14
matzbot Sep 14, 2026
e96cea4
coroutine: add native behavior tests. (#18817)
samuel-williams-shopify Sep 14, 2026
03a426e
[Feature #22279] Add region arguments to String bit operations (#18562)
hasumikin Sep 14, 2026
e4534b8
[ruby/strscan] Fix matched_size when the stored string is shrunk
youdie006 Sep 14, 2026
e7551c0
coroutine: allow pthread resumption across threads. (#18820)
samuel-williams-shopify Sep 14, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ lcov*.info
/*-fake.rb
/*.dll
/*.exe
/coroutine-test
/*.ilk
/*.res
/*.pc
Expand Down
5 changes: 3 additions & 2 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,12 @@ They are still available on rubygems.org and can be installed with
* rss 0.3.3
* 0.3.2 to [0.3.3][rss-0.3.3]
* net-imap 0.6.7
* 0.6.2 to [v0.6.3][net-imap-v0.6.3], [v0.6.4][net-imap-v0.6.4], [v0.6.4.1][net-imap-v0.6.4.1], [v0.6.5][net-imap-v0.6.5], [v0.6.6][net-imap-v0.6.6]
* 0.6.2 to [v0.6.3][net-imap-v0.6.3], [v0.6.4][net-imap-v0.6.4], [v0.6.4.1][net-imap-v0.6.4.1], [v0.6.5][net-imap-v0.6.5], [v0.6.6][net-imap-v0.6.6], [v0.6.7][net-imap-v0.6.7]
* rbs 4.2.0
* 3.10.0 to [v3.10.1][rbs-v3.10.1], [v3.10.2][rbs-v3.10.2], [v3.10.3][rbs-v3.10.3], [v3.10.4][rbs-v3.10.4], [v4.0.0.dev.1][rbs-v4.0.0.dev.1], [v4.0.0.dev.2][rbs-v4.0.0.dev.2], [v4.0.0.dev.3][rbs-v4.0.0.dev.3], [v4.0.0.dev.4][rbs-v4.0.0.dev.4], [v4.0.0.dev.5][rbs-v4.0.0.dev.5], [v4.0.0][rbs-v4.0.0], [v4.0.1.dev.1][rbs-v4.0.1.dev.1], [v4.0.1.dev.2][rbs-v4.0.1.dev.2], [v4.0.1][rbs-v4.0.1], [v4.0.2][rbs-v4.0.2], [v4.0.3][rbs-v4.0.3], [v4.1.0.pre.1][rbs-v4.1.0.pre.1], [v4.1.0.pre.2][rbs-v4.1.0.pre.2], [v4.1.0][rbs-v4.1.0], [v4.1.1.pre.1][rbs-v4.1.1.pre.1], [v4.1.1][rbs-v4.1.1], [v4.1.2][rbs-v4.1.2], [v4.1.3][rbs-v4.1.3], [v4.2.0.pre.1][rbs-v4.2.0.pre.1], [v4.2.0][rbs-v4.2.0]
* typeprof 0.33.1
* mutex_m 0.3.0
* bigdecimal 4.1.2
* bigdecimal 4.1.3
* 4.0.1 to [v4.1.0][bigdecimal-v4.1.0], [v4.1.1][bigdecimal-v4.1.1], [v4.1.2][bigdecimal-v4.1.2]
* resolv-replace 0.2.0
* 0.1.1 to [v0.2.0][resolv-replace-v0.2.0]
Expand Down Expand Up @@ -579,6 +579,7 @@ A lot of work has gone into making Ractors more stable, performant, and usable.
[net-imap-v0.6.4.1]: https://github.com/ruby/net-imap/releases/tag/v0.6.4.1
[net-imap-v0.6.5]: https://github.com/ruby/net-imap/releases/tag/v0.6.5
[net-imap-v0.6.6]: https://github.com/ruby/net-imap/releases/tag/v0.6.6
[net-imap-v0.6.7]: https://github.com/ruby/net-imap/releases/tag/v0.6.7
[rbs-v3.10.1]: https://github.com/ruby/rbs/releases/tag/v3.10.1
[rbs-v3.10.2]: https://github.com/ruby/rbs/releases/tag/v3.10.2
[rbs-v3.10.3]: https://github.com/ruby/rbs/releases/tag/v3.10.3
Expand Down
48 changes: 46 additions & 2 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \

PRISM_BUILD_DIR = prism

COROUTINE_TEST = coroutine-test$(EXEEXT)
COROUTINE_TEST_OBJS = coroutine-main.$(OBJEXT) \
coroutine-stack.$(OBJEXT) \
coroutine-test_initialize_destroy.$(OBJEXT) \
coroutine-test_pthread_resume.$(OBJEXT) \
coroutine-test_transfer_repeat.$(OBJEXT) \
coroutine-test_transfer_return.$(OBJEXT)

LIBPRISM_OBJS = \
prism/arena.$(OBJEXT) \
prism/buffer.$(OBJEXT) \
Expand Down Expand Up @@ -691,6 +699,7 @@ noarch_config_h = tmp/include/noarch/ruby/config.h
clean: clean-ext clean-enc clean-golf clean-docs clean-extout clean-modular-gc clean-local clean-platform clean-spec
clean-local:: clean-runnable
$(Q)$(RM) $(ALLOBJS) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
$(Q)$(RM) $(COROUTINE_TEST) $(COROUTINE_TEST_OBJS)
$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time
$(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) $(COROUTINE_H:/Context.h=/.time)
$(Q)$(RM) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) ruby.imp ChangeLog $(STATIC_RUBY)$(EXEEXT)
Expand Down Expand Up @@ -931,8 +940,15 @@ yes-test-tool: prog PHONY
$(ACTIONS_ENDGROUP)
no-test-tool: PHONY

test-coroutine: $(TEST_RUNNABLE)-test-coroutine
yes-test-coroutine: $(COROUTINE_TEST) PHONY
$(ACTIONS_GROUP)
$(Q)$(exec) $(COROUTINE_TEST_RUN)
$(ACTIONS_ENDGROUP)
no-test-coroutine: PHONY

test-sample: test-basic # backward compatibility for mswin-build
test-short: btest-ruby $(DOT_WAIT) test-knownbug $(DOT_WAIT) test-basic
test-short: test-coroutine $(DOT_WAIT) btest-ruby $(DOT_WAIT) test-knownbug $(DOT_WAIT) test-basic
test: test-short

# Separate to skip updating encs and exts by `make -o test-precheck`
Expand Down Expand Up @@ -1043,7 +1059,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc
.PHONY: distclean-srcs distclean-srcs-local distclean-srcs-ext
.PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
.PHONY: realclean-srcs realclean-srcs-local realclean-srcs-ext
.PHONY: exam check test test-short test-all btest btest-ruby test-basic test-knownbug
.PHONY: exam check test test-short test-all test-coroutine btest btest-ruby test-basic test-knownbug
.PHONY: run runruby parse benchmark gdb gdb-ruby
.PHONY: update-mspec update-rubyspec test-rubyspec test-spec
.PHONY: touch-unicode-files
Expand Down Expand Up @@ -1137,6 +1153,34 @@ $(COROUTINE_H:/Context.h=/.time):
$(Q) $(MAKEDIRS) $(@D)
@$(NULLCMD) > $@

$(COROUTINE_TEST): $(COROUTINE_TEST_OBJS) $(COROUTINE_OBJ)
$(ECHO) linking $@
$(Q) $(COROUTINE_TEST_LINK)

coroutine-main.$(OBJEXT): {$(VPATH)}coroutine/test/main.c
$(ECHO) compiling $(srcdir)/coroutine/test/main.c
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/coroutine/test/main.c

coroutine-stack.$(OBJEXT): {$(VPATH)}coroutine/test/stack.c
$(ECHO) compiling $(srcdir)/coroutine/test/stack.c
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/coroutine/test/stack.c

coroutine-test_initialize_destroy.$(OBJEXT): {$(VPATH)}coroutine/test/test_initialize_destroy.c
$(ECHO) compiling $(srcdir)/coroutine/test/test_initialize_destroy.c
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/coroutine/test/test_initialize_destroy.c

coroutine-test_pthread_resume.$(OBJEXT): {$(VPATH)}coroutine/test/test_pthread_resume.c
$(ECHO) compiling $(srcdir)/coroutine/test/test_pthread_resume.c
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/coroutine/test/test_pthread_resume.c

coroutine-test_transfer_repeat.$(OBJEXT): {$(VPATH)}coroutine/test/test_transfer_repeat.c
$(ECHO) compiling $(srcdir)/coroutine/test/test_transfer_repeat.c
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/coroutine/test/test_transfer_repeat.c

coroutine-test_transfer_return.$(OBJEXT): {$(VPATH)}coroutine/test/test_transfer_return.c
$(ECHO) compiling $(srcdir)/coroutine/test/test_transfer_return.c
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/coroutine/test/test_transfer_return.c

###

# dependencies for generated C sources.
Expand Down
Loading