mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #6766 : fdr/rust/time-by-value, r=catamorphism

Browse Source 
Per the recommendation of the now-removed FIXME.
This commit is contained in:
bors 2013-05-27 23:41:19 -07:00
commit f7f36a8373
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libextra/time.rs
View File

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -22,11 +22,11 @@ pub mod rustrt {
pub unsafe fn precise_time_ns(ns: &mut u64);
pub unsafe fn rust_tzset();
// FIXME: The i64 values can be passed by-val when #2064 is fixed.
pub unsafe fn rust_gmtime(sec: i64, nsec: i32, result: &mut Tm);
pub unsafe fn rust_localtime(sec: i64, nsec: i32, result: &mut Tm);
pub unsafe fn rust_timegm(tm: &Tm, sec: &mut i64);
pub unsafe fn rust_mktime(tm: &Tm, sec: &mut i64);
pub unsafe fn rust_timegm(tm: &Tm) -> i64;
pub unsafe fn rust_mktime(tm: &Tm) -> i64;
}
}
@ -177,12 +177,11 @@ pub impl Tm {
/// Convert time to the seconds from January 1, 1970
fn to_timespec(&self) -> Timespec {
unsafe {
let mut sec = 0i64;
if self.tm_gmtoff == 0_i32 {
rustrt::rust_timegm(self, &mut sec);
} else {
rustrt::rust_mktime(self, &mut sec);
}
let sec = match self.tm_gmtoff {
0_i32 => rustrt::rust_timegm(self),
_ => rustrt::rust_mktime(self)
};
Timespec::new(sec, self.tm_nsec)
}
}

12
src/rt/rust_builtin.cpp
View File

@ -459,18 +459,18 @@ rust_localtime(int64_t sec, int32_t nsec, rust_tm *timeptr) {
tm_to_rust_tm(&tm, timeptr, gmtoff, zone, nsec);
}
extern "C" CDECL void
rust_timegm(rust_tm* timeptr, int64_t *out) {
extern "C" CDECL int64_t
rust_timegm(rust_tm* timeptr) {
tm t;
rust_tm_to_tm(timeptr, &t);
*out = TIMEGM(&t);
return TIMEGM(&t);
}
extern "C" CDECL void
rust_mktime(rust_tm* timeptr, int64_t *out) {
extern "C" CDECL int64_t
rust_mktime(rust_tm* timeptr) {
tm t;
rust_tm_to_tm(timeptr, &t);
*out = mktime(&t);
return mktime(&t);
}
extern "C" CDECL rust_sched_id