Prefer rb_sym2str over rb_id2str(SYM2ID)

eightbitraptor · eightbitraptor · commit 5465dca954d0 · 2026-06-24T22:15:52.000+01:00
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
@@ -1448,7 +1448,7 @@ rsock_revlookup_flag(VALUE revlookup, int *norevlookup)
         id = SYM2ID(revlookup);
         if (id == id_numeric) return_norevlookup(1);
         if (id == id_hostname) return_norevlookup(0);
-        rb_raise(rb_eArgError, "invalid reverse_lookup flag: :%s", rb_id2name(id));
+        rb_raise(rb_eArgError, "invalid reverse_lookup flag: :%"PRIsVALUE, rb_sym2str(revlookup));
     }
     return 0;
 #undef return_norevlookup
diff --git a/struct.c b/struct.c
@@ -1016,7 +1016,7 @@ inspect_struct(VALUE s, VALUE prefix, int recur)
         slot = RARRAY_AREF(members, i);
         id = SYM2ID(slot);
         if (rb_is_local_id(id) || rb_is_const_id(id)) {
-            rb_str_append(str, rb_id2str(id));
+            rb_str_append(str, rb_sym2str(slot));
         }
         else {
             rb_str_append(str, rb_inspect(slot));

Original file line number	Diff line number	Diff line change
`@@ -1448,7 +1448,7 @@ rsock_revlookup_flag(VALUE revlookup, int *norevlookup)`
`1448`	`1448`	`id = SYM2ID(revlookup);`
`1449`	`1449`	`if (id == id_numeric) return_norevlookup(1);`
`1450`	`1450`	`if (id == id_hostname) return_norevlookup(0);`
`1451`		`- rb_raise(rb_eArgError, "invalid reverse_lookup flag: :%s", rb_id2name(id));`
	`1451`	`+ rb_raise(rb_eArgError, "invalid reverse_lookup flag: :%"PRIsVALUE, rb_sym2str(revlookup));`
`1452`	`1452`	`}`
`1453`	`1453`	`return 0;`
`1454`	`1454`	`#undef return_norevlookup`
Original file line number	Diff line number	Diff line change
`@@ -1016,7 +1016,7 @@ inspect_struct(VALUE s, VALUE prefix, int recur)`
`1016`	`1016`	`slot = RARRAY_AREF(members, i);`
`1017`	`1017`	`id = SYM2ID(slot);`
`1018`	`1018`	`if (rb_is_local_id(id) \|\| rb_is_const_id(id)) {`
`1019`		`- rb_str_append(str, rb_id2str(id));`
	`1019`	`+ rb_str_append(str, rb_sym2str(slot));`
`1020`	`1020`	`}`
`1021`	`1021`	`else {`
`1022`	`1022`	`rb_str_append(str, rb_inspect(slot));`