style: fix formatting and add ImportAttributes to test calls

- Fix import ordering in guest/mod.rs (cargo fmt)
- Fix line length in clock.rs (cargo fmt)
- Add missing ImportAttributes (None) arg to resolve/load calls in tests
  to match the updated rquickjs trait signatures from the rebase

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>

Author: simongdavies

src/hyperlight-js-runtime/src/guest/mod.rs

@@ -34,10 +34,11 @@ use anyhow::{anyhow, Context as _};
 use hashbrown::HashMap;
 use hyperlight_guest_bin::error::{ErrorCode, HyperlightGuestError, Result};
 use hyperlight_guest_bin::{guest_function, host_function, main};
-use crate::JsRuntime;
 use spin::Mutex;
 use tracing::instrument;
 
+use crate::JsRuntime;
+
 mod stubs;
 
 struct Host;
@@ -74,8 +75,8 @@ impl crate::host::Host for Host {
     }
 }
 
-static RUNTIME: spin::LazyLock<Mutex<crate::JsRuntime>> = spin::LazyLock::new(|| {
-    Mutex::new(crate::JsRuntime::new(Host).unwrap_or_else(|e| {
+static RUNTIME: spin::LazyLock<Mutex<JsRuntime>> = spin::LazyLock::new(|| {
+    Mutex::new(JsRuntime::new(Host).unwrap_or_else(|e| {
         panic!("Failed to initialize JS runtime: {e:#?}");
     }))
 });

src/hyperlight-js-runtime/src/guest/stubs/clock.rs

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 use hyperlight_guest_bin::error::Result;
-use hyperlight_guest_bin::host_function;
-use hyperlight_guest_bin::libc;
+use hyperlight_guest_bin::{host_function, libc};
 
 fn micros_since_epoch() -> u64 {
     #[host_function("CurrentTimeMicros")]
@@ -33,7 +32,10 @@ fn micros_since_epoch() -> u64 {
 // hyperlight runtime's libc is a stub that returns an epuch and increments time by 1s
 // on every call.
 #[unsafe(no_mangle)]
-extern "C" fn __wrap_clock_gettime(clk_id: libc::clockid_t, ts: *mut libc::timespec) -> libc::c_int {
+extern "C" fn __wrap_clock_gettime(
+    clk_id: libc::clockid_t,
+    ts: *mut libc::timespec,
+) -> libc::c_int {
     const CLOCK_REALTIME: libc::clockid_t = libc::CLOCK_REALTIME as libc::clockid_t;
     const CLOCK_MONOTONIC: libc::clockid_t = libc::CLOCK_MONOTONIC as libc::clockid_t;
 

src/hyperlight-js-runtime/src/modules/mod.rs

@@ -19,8 +19,7 @@ use hashbrown::HashMap;
 use rquickjs::loader::{ImportAttributes, Loader, Resolver};
 use rquickjs::module::ModuleDef;
 use rquickjs::{Ctx, Module, Result};
-use spin::LazyLock;
-use spin::Mutex;
+use spin::{LazyLock, Mutex};
 
 #[doc(hidden)]
 pub mod console;

src/hyperlight-js-runtime/tests/native_modules.rs

@@ -61,7 +61,7 @@ fn loader_resolves_all_builtin_modules() {
 
     with_qjs_context(|ctx| {
         for name in &builtins {
-            let result = loader.resolve(&ctx, ".", name);
+            let result = loader.resolve(&ctx, ".", name, None);
             assert!(result.is_ok(), "Should resolve built-in module '{name}'");
             assert_eq!(result.unwrap(), *name);
         }
@@ -73,7 +73,7 @@ fn loader_rejects_unknown_modules() {
     let mut loader = hyperlight_js_runtime::modules::NativeModuleLoader;
 
     with_qjs_context(|ctx| {
-        let result = loader.resolve(&ctx, ".", "nonexistent");
+        let result = loader.resolve(&ctx, ".", "nonexistent", None);
         assert!(result.is_err(), "Should reject unknown modules");
     });
 }
@@ -85,7 +85,7 @@ fn loader_loads_all_builtin_modules() {
 
     with_qjs_context(|ctx| {
         for name in &builtins {
-            let result = loader.load(&ctx, name);
+            let result = loader.load(&ctx, name, None);
             assert!(
                 result.is_ok(),
                 "Should load built-in module '{name}', got: {:?}",
@@ -116,13 +116,13 @@ fn registered_custom_module_resolves_and_loads() {
     let mut loader = hyperlight_js_runtime::modules::NativeModuleLoader;
 
     with_qjs_context(|ctx| {
-        let result = loader.resolve(&ctx, ".", "greeting");
+        let result = loader.resolve(&ctx, ".", "greeting", None);
         assert!(
             result.is_ok(),
             "Should resolve registered 'greeting' module"
         );
 
-        let result = loader.load(&ctx, "greeting");
+        let result = loader.load(&ctx, "greeting", None);
         assert!(
             result.is_ok(),
             "Should load registered 'greeting' module, got: {:?}",
@@ -144,7 +144,7 @@ fn builtins_still_work_after_custom_registration() {
 
     with_qjs_context(|ctx| {
         for name in &builtins {
-            let result = loader.resolve(&ctx, ".", name);
+            let result = loader.resolve(&ctx, ".", name, None);
             assert!(
                 result.is_ok(),
                 "Built-in '{name}' should still resolve after custom registration"
@@ -221,7 +221,7 @@ fn macro_generated_init_registers_modules() {
     let mut loader = hyperlight_js_runtime::modules::NativeModuleLoader;
 
     with_qjs_context(|ctx| {
-        let result = loader.resolve(&ctx, ".", "test_math_macro");
+        let result = loader.resolve(&ctx, ".", "test_math_macro", None);
         assert!(
             result.is_ok(),
             "Module registered via native_modules! macro should resolve"