Move items at the root of the script crate to a module

components/script/init.rs

@@ -0,0 +1,69 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::codegen::RegisterBindings;
+use crate::dom::bindings::proxyhandler;
+use crate::serviceworker_manager::ServiceWorkerManager;
+use script_traits::SWManagerSenders;
+
+#[cfg(target_os = "linux")]
+#[allow(unsafe_code)]
+fn perform_platform_specific_initialization() {
+    // 4096 is default max on many linux systems
+    const MAX_FILE_LIMIT: libc::rlim_t = 4096;
+
+    // Bump up our number of file descriptors to save us from impending doom caused by an onslaught
+    // of iframes.
+    unsafe {
+        let mut rlim = libc::rlimit {
+            rlim_cur: 0,
+            rlim_max: 0,
+        };
+        match libc::getrlimit(libc::RLIMIT_NOFILE, &mut rlim) {
+            0 => {
+                if rlim.rlim_cur >= MAX_FILE_LIMIT {
+                    // we have more than enough
+                    return;
+                }
+
+                rlim.rlim_cur = match rlim.rlim_max {
+                    libc::RLIM_INFINITY => MAX_FILE_LIMIT,
+                    _ => {
+                        if rlim.rlim_max < MAX_FILE_LIMIT {
+                            rlim.rlim_max
+                        } else {
+                            MAX_FILE_LIMIT
+                        }
+                    },
+                };
+                match libc::setrlimit(libc::RLIMIT_NOFILE, &rlim) {
+                    0 => (),
+                    _ => warn!("Failed to set file count limit"),
+                };
+            },
+            _ => warn!("Failed to get file count limit"),
+        };
+    }
+}
+
+#[cfg(not(target_os = "linux"))]
+fn perform_platform_specific_initialization() {}
+
+pub fn init_service_workers(sw_senders: SWManagerSenders) {
+    // Spawn the service worker manager passing the constellation sender
+    ServiceWorkerManager::spawn_manager(sw_senders);
+}
+
+#[allow(unsafe_code)]
+pub fn init() {
+    unsafe {
+        proxyhandler::init();
+
+        // Create the global vtables used by the (generated) DOM
+        // bindings to implement JS proxies.
+        RegisterBindings::RegisterProxyHandlers();
+    }
+
+    perform_platform_specific_initialization();
+}

components/script/lib.rs

@@ -59,6 +59,7 @@ mod canvas_state;
 mod compartments;
 pub mod fetch;
 mod image_listener;
+mod init;
 mod layout_image;
 mod mem;
 mod microtask;
@@ -79,6 +80,8 @@ mod timers;
 mod unpremultiplytable;
 mod webdriver_handlers;
 
+pub use init::{init, init_service_workers};
+
 /// A module with everything layout can use from script.
 ///
 /// Try to keep this small!
@@ -98,69 +101,3 @@ pub mod layout_exports {
     pub use crate::dom::shadowroot::{LayoutShadowRootHelpers, ShadowRoot};
     pub use crate::dom::text::Text;
 }
-
-use crate::dom::bindings::codegen::RegisterBindings;
-use crate::dom::bindings::proxyhandler;
-use crate::serviceworker_manager::ServiceWorkerManager;
-use script_traits::SWManagerSenders;
-
-#[cfg(target_os = "linux")]
-#[allow(unsafe_code)]
-fn perform_platform_specific_initialization() {
-    // 4096 is default max on many linux systems
-    const MAX_FILE_LIMIT: libc::rlim_t = 4096;
-
-    // Bump up our number of file descriptors to save us from impending doom caused by an onslaught
-    // of iframes.
-    unsafe {
-        let mut rlim = libc::rlimit {
-            rlim_cur: 0,
-            rlim_max: 0,
-        };
-        match libc::getrlimit(libc::RLIMIT_NOFILE, &mut rlim) {
-            0 => {
-                if rlim.rlim_cur >= MAX_FILE_LIMIT {
-                    // we have more than enough
-                    return;
-                }
-
-                rlim.rlim_cur = match rlim.rlim_max {
-                    libc::RLIM_INFINITY => MAX_FILE_LIMIT,
-                    _ => {
-                        if rlim.rlim_max < MAX_FILE_LIMIT {
-                            rlim.rlim_max
-                        } else {
-                            MAX_FILE_LIMIT
-                        }
-                    },
-                };
-                match libc::setrlimit(libc::RLIMIT_NOFILE, &rlim) {
-                    0 => (),
-                    _ => warn!("Failed to set file count limit"),
-                };
-            },
-            _ => warn!("Failed to get file count limit"),
-        };
-    }
-}
-
-#[cfg(not(target_os = "linux"))]
-fn perform_platform_specific_initialization() {}
-
-pub fn init_service_workers(sw_senders: SWManagerSenders) {
-    // Spawn the service worker manager passing the constellation sender
-    ServiceWorkerManager::spawn_manager(sw_senders);
-}
-
-#[allow(unsafe_code)]
-pub fn init() {
-    unsafe {
-        proxyhandler::init();
-
-        // Create the global vtables used by the (generated) DOM
-        // bindings to implement JS proxies.
-        RegisterBindings::RegisterProxyHandlers();
-    }
-
-    perform_platform_specific_initialization();
-}