user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename ctime to asctime and add *proper* ctime.

Browse source 
In C, `ctime(t)` is equivalent to `asctime(localtime(t))`, so the result
should depend on the local timezone. Current `ctime` is compatible with
`asctime` in C, not `ctime`.

This commit renames `ctime` to `asctime` and adds `ctime` which converts
the time to the local timezone before formatting it.

This commit also fixes the documentation of them. Current documentation
of `ctime` says it returns "a string of the current time." However, it
actually returns a string of the time represented as `self`, not the
time when it is called.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
This commit is contained in:
OGINO Masanori 2014-07-03 23:52:43 +09:00
parent e6c54a12c4
commit 4530f8b2ef
1 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/libtime/lib.rs
View file

@ -316,10 +316,24 @@ impl Tm {
}
/**
* Return a string of the current time in the form
* "Thu Jan 1 00:00:00 1970".
* Returns a time string formatted according to the `asctime` format in ISO
* C, in the local timezone.
*
* Example: "Thu Jan 1 00:00:00 1970"
*/
pub fn ctime(&self) -> String { self.strftime("%c") }
pub fn ctime(&self) -> String {
self.to_local().asctime()
}
/**
* Returns a time string formatted according to the `asctime` format in ISO
* C.
*
* Example: "Thu Jan 1 00:00:00 1970"
*/
pub fn asctime(&self) -> String {
self.strftime("%c")
}
/// Formats the time according to the format string.
pub fn strftime(&self, format: &str) -> String {
@ -1371,6 +1385,19 @@ mod tests {
assert_eq!(strptime("360", "%Y-%m-%d"), Err("Invalid year".to_string()))
}
fn test_asctime() {
set_time_zone();
let time = Timespec::new(1234567890, 54321);
let utc = at_utc(time);
let local = at(time);
debug!("test_ctime: {:?} {:?}", utc.asctime(), local.asctime());
assert_eq!(utc.asctime(), "Fri Feb 13 23:31:30 2009".to_string());
assert_eq!(local.asctime(), "Fri Feb 13 15:31:30 2009".to_string());
}
fn test_ctime() {
set_time_zone();
@ -1380,7 +1407,7 @@ mod tests {
debug!("test_ctime: {:?} {:?}", utc.ctime(), local.ctime());
assert_eq!(utc.ctime(), "Fri Feb 13 23:31:30 2009".to_string());
assert_eq!(utc.ctime(), "Fri Feb 13 15:31:30 2009".to_string());
assert_eq!(local.ctime(), "Fri Feb 13 15:31:30 2009".to_string());
}
@ -1435,11 +1462,13 @@ mod tests {
assert_eq!(local.strftime("%z"), "-0800".to_string());
assert_eq!(local.strftime("%%"), "%".to_string());
assert_eq!(local.asctime(), "Fri Feb 13 15:31:30 2009".to_string());
assert_eq!(local.ctime(), "Fri Feb 13 15:31:30 2009".to_string());
assert_eq!(local.rfc822z(), "Fri, 13 Feb 2009 15:31:30 -0800".to_string());
assert_eq!(local.rfc3339(), "2009-02-13T15:31:30-08:00".to_string());
assert_eq!(utc.ctime(), "Fri Feb 13 23:31:30 2009".to_string());
assert_eq!(utc.asctime(), "Fri Feb 13 23:31:30 2009".to_string());
assert_eq!(utc.ctime(), "Fri Feb 13 15:31:30 2009".to_string());
assert_eq!(utc.rfc822(), "Fri, 13 Feb 2009 23:31:30 GMT".to_string());
assert_eq!(utc.rfc822z(), "Fri, 13 Feb 2009 23:31:30 -0000".to_string());
assert_eq!(utc.rfc3339(), "2009-02-13T23:31:30Z".to_string());
@ -1488,6 +1517,7 @@ mod tests {
test_to_timespec();
test_conversions();
test_strptime();
test_asctime();
test_ctime();
test_strftime();
test_timespec_eq_ord();