Prefer rb_module_new() over rb_define_module_id()

XrXr · XrXr · commit e0944bde9178 · 2020-11-25T17:05:06.000-05:00
rb_define_module_id() doesn't do anything with its parameter so
it's a bit confusing.
diff --git a/class.c b/class.c
@@ -859,6 +859,7 @@ rb_module_new(void)
     return (VALUE)mdl;
 }
 
+// Kept for compatibility. Use rb_module_new() instead.
 VALUE
 rb_define_module_id(ID id)
 {
@@ -882,7 +883,7 @@ rb_define_module(const char *name)
         rb_vm_add_root_module(module);
 	return module;
     }
-    module = rb_define_module_id(id);
+    module = rb_module_new();
     rb_vm_add_root_module(module);
     rb_const_set(rb_cObject, id, module);
 
@@ -909,7 +910,7 @@ rb_define_module_id_under(VALUE outer, ID id)
 	}
 	return module;
     }
-    module = rb_define_module_id(id);
+    module = rb_module_new();
     rb_const_set(outer, id, module);
     rb_set_class_path_string(module, outer, rb_id2str(id));
     rb_gc_register_mark_object(module);
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
@@ -4043,7 +4043,7 @@ static VALUE
 vm_declare_module(ID id, VALUE cbase)
 {
     /* new module declaration */
-    return declare_under(id, cbase, rb_define_module_id(id));
+    return declare_under(id, cbase, rb_module_new());
 }
 
 NORETURN(static void unmatched_redefinition(const char *type, VALUE cbase, ID id, VALUE old));

Original file line number	Diff line number	Diff line change
`@@ -859,6 +859,7 @@ rb_module_new(void)`
`859`	`859`	`return (VALUE)mdl;`
`860`	`860`	`}`
`861`	`861`
	`862`	`+// Kept for compatibility. Use rb_module_new() instead.`
`862`	`863`	`VALUE`
`863`	`864`	`rb_define_module_id(ID id)`
`864`	`865`	`{`
`@@ -882,7 +883,7 @@ rb_define_module(const char *name)`
`882`	`883`	`rb_vm_add_root_module(module);`
`883`	`884`	`return module;`
`884`	`885`	`}`
`885`		`- module = rb_define_module_id(id);`
	`886`	`+ module = rb_module_new();`
`886`	`887`	`rb_vm_add_root_module(module);`
`887`	`888`	`rb_const_set(rb_cObject, id, module);`
`888`	`889`
`@@ -909,7 +910,7 @@ rb_define_module_id_under(VALUE outer, ID id)`
`909`	`910`	`}`
`910`	`911`	`return module;`
`911`	`912`	`}`
`912`		`- module = rb_define_module_id(id);`
	`913`	`+ module = rb_module_new();`
`913`	`914`	`rb_const_set(outer, id, module);`
`914`	`915`	`rb_set_class_path_string(module, outer, rb_id2str(id));`
`915`	`916`	`rb_gc_register_mark_object(module);`
Original file line number	Diff line number	Diff line change
`@@ -4043,7 +4043,7 @@ static VALUE`
`4043`	`4043`	`vm_declare_module(ID id, VALUE cbase)`
`4044`	`4044`	`{`
`4045`	`4045`	`/* new module declaration */`
`4046`		`- return declare_under(id, cbase, rb_define_module_id(id));`
	`4046`	`+ return declare_under(id, cbase, rb_module_new());`
`4047`	`4047`	`}`
`4048`	`4048`
`4049`	`4049`	`NORETURN(static void unmatched_redefinition(const char *type, VALUE cbase, ID id, VALUE old));`