Skip to content

Commit ff19afd

Browse files
committed
---
yaml --- r: 82127 b: refs/heads/master c: a0c5994 h: refs/heads/master i: 82125: 894c85b 82123: 2b5ce16 82119: 270638f 82111: c5911d8 v: v3
1 parent e868530 commit ff19afd

File tree

3 files changed

+7
-394
lines changed

3 files changed

+7
-394
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 012f909f3546dc7515b43ba389cfc0a1ead0d21f
2+
refs/heads/master: a0c59941e3f6cca0ff1505c4ed431ac7327cc66a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/libextra/time.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,6 @@ pub fn now() -> Tm {
174174
at(get_time())
175175
}
176176

177-
/// Parses the time from the string according to the format string.
178-
pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {
179-
do_strptime(s, format)
180-
}
181-
182-
/// Formats the time according to the format string.
183-
pub fn strftime(format: &str, tm: &Tm) -> ~str {
184-
do_strftime(format, tm)
185-
}
186177

187178
impl Tm {
188179
/// Convert time to the seconds from January 1, 1970
@@ -264,7 +255,8 @@ impl Tm {
264255
}
265256
}
266257

267-
fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
258+
/// Parses the time from the string according to the format string.
259+
pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {
268260
fn match_str(s: &str, pos: uint, needle: &str) -> bool {
269261
let mut i = pos;
270262
for ch in needle.byte_iter() {
@@ -733,7 +725,8 @@ fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
733725
}
734726
}
735727

736-
fn do_strftime(format: &str, tm: &Tm) -> ~str {
728+
/// Formats the time according to the format string.
729+
pub fn strftime(format: &str, tm: &Tm) -> ~str {
737730
fn days_in_year(year: int) -> i32 {
738731
if ((year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0))) {
739732
366 /* Days in a leap year */

0 commit comments

Comments
 (0)