diff options
| author | Chris Peterson <cpeterson@mozilla.com> | 2012-02-18 01:39:42 -0800 |
|---|---|---|
| committer | Chris Peterson <cpeterson@mozilla.com> | 2012-02-18 01:39:42 -0800 |
| commit | 3d202d7eaebd97e2b98a6c6021dd2bb763356d80 (patch) | |
| tree | e29cf58c867a59d3c110c81f2167ea5df22cbfc5 /src | |
| parent | b73bc3085896c90f6215d070b24ac80bf02cee6a (diff) | |
| download | rust-3d202d7eaebd97e2b98a6c6021dd2bb763356d80.tar.gz rust-3d202d7eaebd97e2b98a6c6021dd2bb763356d80.zip | |
rt: rename nano_time() builtin to match time::precise_time_ns()
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstd/time.rs | 4 | ||||
| -rw-r--r-- | src/rt/rust_builtin.cpp | 2 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/time.rs b/src/libstd/time.rs index ba2d6da4432..aaf94657a8b 100644 --- a/src/libstd/time.rs +++ b/src/libstd/time.rs @@ -5,7 +5,7 @@ Module: time #[abi = "cdecl"] native mod rustrt { fn get_time(&sec: u32, &usec: u32); - fn nano_time(&ns: u64); + fn precise_time_ns(&ns: u64); } /* @@ -34,7 +34,7 @@ Function: precise_time_ns Returns the current value of a high-resolution performance counter in nanoseconds since an unspecified epoch. */ -fn precise_time_ns() -> u64 { let ns = 0u64; rustrt::nano_time(ns); ret ns; } +fn precise_time_ns() -> u64 { let ns = 0u64; rustrt::precise_time_ns(ns); ns } /* Function: precise_time_s diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index d17741ac56b..6c0cd5e5fc0 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -420,7 +420,7 @@ get_time(uint32_t *sec, uint32_t *usec) { #endif extern "C" CDECL void -nano_time(uint64_t *ns) { +precise_time_ns(uint64_t *ns) { timer t; *ns = t.time_ns(); } diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index d4fbc0b90bd..5b62d606917 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -13,10 +13,10 @@ get_port_id get_task_id get_time last_os_error -nano_time new_port new_task port_recv +precise_time_ns rust_port_select rand_free rand_new |