Skip to content

Commit 3d74637

Browse files
committed
---
yaml --- r: 95167 b: refs/heads/dist-snap c: a0c5994 h: refs/heads/master i: 95165: d508eae 95163: 0afed38 95159: 1b16585 95151: 5d3114a 95135: 9e567f9 95103: 953638f v: v3
1 parent ff50ef5 commit 3d74637

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
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 012f909f3546dc7515b43ba389cfc0a1ead0d21f
9+
refs/heads/dist-snap: a0c59941e3f6cca0ff1505c4ed431ac7327cc66a
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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)