Skip to content

Commit f0378ec

Browse files
committed
---
yaml --- r: 14369 b: refs/heads/try c: 3d202d7 h: refs/heads/master i: 14367: 789b735 v: v3
1 parent e23b7b1 commit f0378ec

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: b73bc3085896c90f6215d070b24ac80bf02cee6a
5+
refs/heads/try: 3d202d7eaebd97e2b98a6c6021dd2bb763356d80
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libstd/time.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Module: time
55
#[abi = "cdecl"]
66
native mod rustrt {
77
fn get_time(&sec: u32, &usec: u32);
8-
fn nano_time(&ns: u64);
8+
fn precise_time_ns(&ns: u64);
99
}
1010

1111
/*
@@ -34,7 +34,7 @@ Function: precise_time_ns
3434
Returns the current value of a high-resolution performance counter
3535
in nanoseconds since an unspecified epoch.
3636
*/
37-
fn precise_time_ns() -> u64 { let ns = 0u64; rustrt::nano_time(ns); ret ns; }
37+
fn precise_time_ns() -> u64 { let ns = 0u64; rustrt::precise_time_ns(ns); ns }
3838

3939
/*
4040
Function: precise_time_s

branches/try/src/rt/rust_builtin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ get_time(uint32_t *sec, uint32_t *usec) {
420420
#endif
421421

422422
extern "C" CDECL void
423-
nano_time(uint64_t *ns) {
423+
precise_time_ns(uint64_t *ns) {
424424
timer t;
425425
*ns = t.time_ns();
426426
}

branches/try/src/rt/rustrt.def.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ get_port_id
1313
get_task_id
1414
get_time
1515
last_os_error
16-
nano_time
1716
new_port
1817
new_task
1918
port_recv
19+
precise_time_ns
2020
rust_port_select
2121
rand_free
2222
rand_new

0 commit comments

Comments
 (0)