Skip to content

Commit b67e102

Browse files
committed
pathname.rbinc conflicts with lib/pathname.rb in our test suite.
We can use `pathname.rb` after merging `lib/pathname.rb` to `pathname_builtin.rb`.
1 parent 647b98a commit b67e102

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

common.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ BUILTIN_RB_SRCS = \
12281228
$(srcdir)/array.rb \
12291229
$(srcdir)/hash.rb \
12301230
$(srcdir)/kernel.rb \
1231-
$(srcdir)/pathname.rb \
1231+
$(srcdir)/pathname_builtin.rb \
12321232
$(srcdir)/ractor.rb \
12331233
$(srcdir)/symbol.rb \
12341234
$(srcdir)/timev.rb \
@@ -11247,7 +11247,7 @@ miniinit.$(OBJEXT): {$(VPATH)}numeric.rb
1124711247
miniinit.$(OBJEXT): {$(VPATH)}onigmo.h
1124811248
miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h
1124911249
miniinit.$(OBJEXT): {$(VPATH)}pack.rb
11250-
miniinit.$(OBJEXT): {$(VPATH)}pathname.rb
11250+
miniinit.$(OBJEXT): {$(VPATH)}pathname_builtin.rb
1125111251
miniinit.$(OBJEXT): {$(VPATH)}prelude.rb
1125211252
miniinit.$(OBJEXT): {$(VPATH)}prism/ast.h
1125311253
miniinit.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
@@ -13037,7 +13037,7 @@ pathname.$(OBJEXT): {$(VPATH)}missing.h
1303713037
pathname.$(OBJEXT): {$(VPATH)}onigmo.h
1303813038
pathname.$(OBJEXT): {$(VPATH)}oniguruma.h
1303913039
pathname.$(OBJEXT): {$(VPATH)}pathname.c
13040-
pathname.$(OBJEXT): {$(VPATH)}pathname.rbinc
13040+
pathname.$(OBJEXT): {$(VPATH)}pathname_builtin.rbinc
1304113041
pathname.$(OBJEXT): {$(VPATH)}ruby.h
1304213042
pathname.$(OBJEXT): {$(VPATH)}st.h
1304313043
pathname.$(OBJEXT): {$(VPATH)}subst.h

inits.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ rb_call_builtin_inits(void)
9999
BUILTIN(ast);
100100
BUILTIN(trace_point);
101101
BUILTIN(pack);
102-
BUILTIN(pathname);
102+
BUILTIN(pathname_builtin);
103103
BUILTIN(warning);
104104
BUILTIN(array);
105105
BUILTIN(hash);

pathname.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@ path_f_pathname(VALUE self, VALUE str)
13111311
return rb_class_new_instance(1, &str, rb_cPathname);
13121312
}
13131313

1314-
#include "pathname.rbinc"
1314+
#include "pathname_builtin.rbinc"
13151315

13161316
/*
13171317
*
File renamed without changes.

0 commit comments

Comments
 (0)