Move top-level uri autoload expressions to URI module scope

artichoke · Jun 10, 2019 · 4eb4514 · 4eb4514
1 parent fc0488c
commit 4eb4514
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/mruby/src/extn/stdlib/uri.rs b/mruby/src/extn/stdlib/uri.rs
@@ -7,7 +7,15 @@ pub fn init(interp: &Mrb) -> Result<(), MrbError> {
     interp.def_rb_source_file("uri/common.rb", include_str!("uri/common.rb"))?;
     interp.def_rb_source_file("uri/file.rb", include_str!("uri/file.rb"))?;
     interp.def_rb_source_file("uri/ftp.rb", include_str!("uri/ftp.rb"))?;
-    interp.def_rb_source_file("uri/generic.rb", include_str!("uri/generic.rb"))?;
+    interp.def_rb_source_file(
+        "uri/generic.rb",
+        include_str!("uri/generic.rb")
+            .replace(r"/[@:\/]/o", r"/[@:\/]/")
+            .replace(
+                "autoload :IPSocket, 'socket'\nautoload :IPAddr, 'ipaddr'",
+                "module URI\n  autoload :IPSocket, 'socket'\n  autoload :IPAddr, 'ipaddr'\nend",
+            ),
+    )?;
     interp.def_rb_source_file("uri/http.rb", include_str!("uri/http.rb"))?;
     interp.def_rb_source_file("uri/https.rb", include_str!("uri/https.rb"))?;
     interp.def_rb_source_file("uri/ldap.rb", include_str!("uri/ldap.rb"))?;