clocks: Introduce the clocks module

This helps alleviate the repetition across clocks tests, namely:
`monotonic-clock`, `wall-clock` and `multi-clock`

Author: saulecabrera

tests/rust/wasm32-wasip3/src/bin/monotonic-clock.rs

@@ -1,29 +1,8 @@
-extern crate wit_bindgen;
-
-wit_bindgen::generate!({
-    inline: r"
-  package test:test;
-
-  world test {
-      include wasi:clocks/imports@0.3.0-rc-2026-01-06;
-      include wasi:cli/command@0.3.0-rc-2026-01-06;
-  }
-",
-    // Work around https://github.com/bytecodealliance/wasm-tools/issues/2285.
-    features:["clocks-timezone"],
-    generate_all
-});
-
-use monotonic_clock::{Duration, Mark};
-use wasi::clocks::monotonic_clock;
-
-const NANOSECOND: Duration = 1;
-const MICROSECOND: Duration = NANOSECOND * 1_000;
-const MILLISECOND: Duration = MICROSECOND * 1_000;
-const SECOND: Duration = MILLISECOND * 1_000;
-const MINUTE: Duration = SECOND * 60;
-const HOUR: Duration = MINUTE * 60;
-const DAY: Duration = HOUR * 24;
+use test_wasm32_wasip3::clocks::{
+    DAY, MILLISECOND, export,
+    exports::wasi::cli::run::Guest,
+    wasi::clocks::monotonic_clock::{self, Duration, Mark},
+};
 
 fn compute_duration(start: Mark, end: Mark) -> Duration {
     // Assume that this test takes less than a day to run (in terms of
@@ -64,7 +43,7 @@ fn test_resolution() {
 
 struct Component;
 export!(Component);
-impl exports::wasi::cli::run::Guest for Component {
+impl Guest for Component {
     async fn run() -> Result<(), ()> {
         test_wait_for().await;
         test_wait_until().await;

tests/rust/wasm32-wasip3/src/bin/multi-clock-wait.rs

@@ -1,23 +1,10 @@
-extern crate wit_bindgen;
-
-wit_bindgen::generate!({
-    inline: r"
-  package test:test;
-
-  world test {
-      include wasi:clocks/imports@0.3.0-rc-2026-01-06;
-      include wasi:cli/command@0.3.0-rc-2026-01-06;
-  }
-",
-    // Work around https://github.com/bytecodealliance/wasm-tools/issues/2285.
-    features:["clocks-timezone"],
-    generate_all
-});
-
 use core::task::{Context, Poll, Waker};
-use monotonic_clock::Mark;
 use std::future::Future;
-use wasi::clocks::monotonic_clock;
+use test_wasm32_wasip3::clocks::{
+    export,
+    exports::wasi::cli::run::Guest,
+    wasi::clocks::monotonic_clock::{self, Mark},
+};
 
 // Offsets relative to "now" at which to wait_until(), in nanoseconds.
 // These are 20 values chosen uniformly randomly over the range [-5
@@ -71,7 +58,8 @@ async fn test_multi_clock_wait() {
 
 struct Component;
 export!(Component);
-impl exports::wasi::cli::run::Guest for Component {
+
+impl Guest for Component {
     async fn run() -> Result<(), ()> {
         test_multi_clock_wait().await;
         Ok(())

tests/rust/wasm32-wasip3/src/bin/wall-clock.rs

@@ -1,19 +1,6 @@
-extern crate wit_bindgen;
-
-wit_bindgen::generate!({
-    inline: r"
-  package test:test;
-
-  world test {
-      include wasi:clocks/imports@0.3.0-rc-2026-01-06;
-  }
-",
-    // Work around https://github.com/bytecodealliance/wasm-tools/issues/2285.
-    features:["clocks-timezone"],
-    generate_all
-});
-
-use wasi::clocks::system_clock;
+use test_wasm32_wasip3::clocks::{
+    export, exports::wasi::cli::run::Guest, wasi::clocks::system_clock,
+};
 
 const NANOSECOND: u32 = 1;
 const MICROSECOND: u32 = NANOSECOND * 1_000;
@@ -25,14 +12,24 @@ fn verify_instant(t: system_clock::Instant) {
 }
 
 fn main() {
-    // Not much we can assert about system-clock time.
-    verify_instant(system_clock::now());
-    let resolution = system_clock::get_resolution();
-    let resolution_instant = system_clock::Instant {
-        seconds: 0,
-        nanoseconds: resolution as u32,
-    };
-    verify_instant(resolution_instant);
-    // Resolution should be non-zero and represent the clock's precision.
-    assert!(resolution > 0, "Clock resolution should be non-zero");
+    unreachable!();
+}
+
+struct Component;
+export!(Component);
+
+impl Guest for Component {
+    async fn run() -> Result<(), ()> {
+        // Not much we can assert about system-clock time.
+        verify_instant(system_clock::now());
+        let resolution = system_clock::get_resolution();
+        let resolution_instant = system_clock::Instant {
+            seconds: 0,
+            nanoseconds: resolution as u32,
+        };
+        verify_instant(resolution_instant);
+        // Resolution should be non-zero and represent the clock's precision.
+        assert!(resolution > 0, "Clock resolution should be non-zero");
+        Ok(())
+    }
 }

tests/rust/wasm32-wasip3/src/clocks.rs

@@ -0,0 +1,24 @@
+wit_bindgen::generate!({
+    inline: r"
+	package wasi-testsuite:test;
+
+	world test {
+	    include wasi:clocks/imports@0.3.0-rc-2026-01-06;
+	    include wasi:cli/command@0.3.0-rc-2026-01-06;
+	}
+    ",
+    features:["clocks-timezone"],
+    pub_export_macro: true,
+    default_bindings_module: "test_wasm32_wasip3::clocks",
+    generate_all
+});
+
+use self::wasi::clocks::monotonic_clock::Duration;
+
+pub const NANOSECOND: Duration = 1;
+pub const MICROSECOND: Duration = NANOSECOND * 1_000;
+pub const MILLISECOND: Duration = MICROSECOND * 1_000;
+pub const SECOND: Duration = MILLISECOND * 1_000;
+pub const MINUTE: Duration = SECOND * 60;
+pub const HOUR: Duration = MINUTE * 60;
+pub const DAY: Duration = HOUR * 24;

tests/rust/wasm32-wasip3/src/lib.rs

@@ -0,0 +1 @@
+pub mod clocks;