Merge pull request #1701 from cremno/do-not-use-mrb_str_cat2

mrb_str_cat2: deprecated since 0cedf8fa

mrbgems/mruby-struct/src/struct.c

@@ -450,7 +450,7 @@ inspect_struct(mrb_state *mrb, mrb_value s, int recur)
     mrb_str_append(mrb, str, mrb_str_new_cstr(mrb, cn));
   }
   if (recur) {
-    return mrb_str_cat2(mrb, str, ":...>");
+    return mrb_str_cat_cstr(mrb, str, ":...>");
   }
 
   members = mrb_struct_members(mrb, s);
@@ -462,10 +462,10 @@ inspect_struct(mrb_state *mrb, mrb_value s, int recur)
     mrb_sym id;
 
     if (i > 0) {
-      mrb_str_cat2(mrb, str, ", ");
+      mrb_str_cat_cstr(mrb, str, ", ");
     }
     else if (cn) {
-      mrb_str_cat2(mrb, str, " ");
+      mrb_str_cat_cstr(mrb, str, " ");
     }
     slot = ptr_members[i];
     id = mrb_symbol(slot);
@@ -479,10 +479,10 @@ inspect_struct(mrb_state *mrb, mrb_value s, int recur)
     else {
       mrb_str_append(mrb, str, mrb_inspect(mrb, slot));
     }
-    mrb_str_cat2(mrb, str, "=");
+    mrb_str_cat_cstr(mrb, str, "=");
     mrb_str_append(mrb, str, mrb_inspect(mrb, ptr[i]));
   }
-  mrb_str_cat2(mrb, str, ">");
+  mrb_str_cat_cstr(mrb, str, ">");
 
   return str;
 }

src/object.c

@@ -443,7 +443,7 @@ mrb_any_to_s(mrb_state *mrb, mrb_value obj)
   const char *cname = mrb_obj_classname(mrb, obj);
 
   mrb_str_buf_cat(mrb, str, "#<", 2);
-  mrb_str_cat2(mrb, str, cname);
+  mrb_str_cat_cstr(mrb, str, cname);
   mrb_str_cat(mrb, str, ":", 1);
   mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_cptr(obj)));
   mrb_str_buf_cat(mrb, str, ">", 1);

src/variable.c

@@ -595,7 +595,7 @@ mrb_obj_iv_inspect(mrb_state *mrb, struct RObject *obj)
     mrb_value str = mrb_str_buf_new(mrb, 30);
 
     mrb_str_buf_cat(mrb, str, "-<", 2);
-    mrb_str_cat2(mrb, str, cn);
+    mrb_str_cat_cstr(mrb, str, cn);
     mrb_str_cat(mrb, str, ":", 1);
     mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, obj));