Skip to content

Rename ctime to asctime and add *proper* ctime. #15369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2014
Merged

Rename ctime to asctime and add *proper* ctime. #15369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions src/libtime/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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 ctime(&self) -> String { self.strftime("%c") }
pub fn asctime(&self) -> String {
self.strftime("%c")
}

/// Formats the time according to the format string.
pub fn strftime(&self, format: &str) -> String {
Expand Down Expand Up @@ -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();

Expand All @@ -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());
}

Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -1488,6 +1517,7 @@ mod tests {
test_to_timespec();
test_conversions();
test_strptime();
test_asctime();
test_ctime();
test_strftime();
test_timespec_eq_ord();
Expand Down