[rust] Remove clock ID from Timer.
zx_timer_create only accepts a clock ID of monotonic and when we remove
the zx_clock_get syscall the concept of defining a clock ID is going to
be a bit difficult to explain. Simplest just to remove it from the rust
API surface now.
Specifically this CL also means we can remove ClockID from Rust when we
remove the deprecated zx::Time::Get function.
Change-Id: I64b9fa9d67d4ab96fdea14a9877573b901c02714
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/491542
Reviewed-by: Tyler Mandry <tmandry@google.com>
Commit-Queue: Jody Sankey <jsankey@google.com>
diff --git a/src/lib/zircon/rust/src/time.rs b/src/lib/zircon/rust/src/time.rs
index 60b1976..4789b7b 100644
--- a/src/lib/zircon/rust/src/time.rs
+++ b/src/lib/zircon/rust/src/time.rs
@@ -352,10 +352,12 @@
/// Wraps the
/// [zx_timer_create](https://fuchsia.dev/fuchsia-src/reference/syscalls/timer_create.md)
/// syscall.
- pub fn create(clock_id: ClockId) -> Result<Timer, Status> {
+ pub fn create() -> Result<Timer, Status> {
let mut out = 0;
let opts = 0;
- let status = unsafe { sys::zx_timer_create(opts, clock_id as u32, &mut out) };
+ let status = unsafe {
+ sys::zx_timer_create(opts, 0 /*ZX_CLOCK_MONOTONIC*/, &mut out)
+ };
ok(status)?;
unsafe { Ok(Self::from(Handle::from_raw(out))) }
}
@@ -422,12 +424,6 @@
}
#[test]
- fn create_timer_invalid_clock() {
- assert_eq!(Timer::create(ClockId::UTC).unwrap_err(), Status::INVALID_ARGS);
- assert_eq!(Timer::create(ClockId::Thread), Err(Status::INVALID_ARGS));
- }
-
- #[test]
fn from_std() {
let std_dur = stdtime::Duration::new(25, 25);
let dur = Duration::from(std_dur);
@@ -454,7 +450,7 @@
let six_secs = 6.seconds();
// Create a timer
- let timer = Timer::create(ClockId::Monotonic).unwrap();
+ let timer = Timer::create().unwrap();
// Should not signal yet.
assert_eq!(
