Skip to content

Commit a34b17c

Browse files
committed
---
yaml --- r: 41893 b: refs/heads/master c: 93e969e h: refs/heads/master i: 41891: d92e8c1 v: v3
1 parent 6cf80ff commit a34b17c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
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: 2c870e40744b873bf3205af7b2057cf4f76c3d1f
2+
refs/heads/master: 93e969e356dc8908a7eeef675269149f81a10eed
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
55
refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libstd/time.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
576576
match match_digits_in_range(s, pos, 1u, false, 1_i32, 7_i32) {
577577
Some(item) => {
578578
let (v, pos) = item;
579-
tm.tm_wday = v-1_i32;
579+
tm.tm_wday = if v == 7 { 0 } else { v };
580580
Ok(pos)
581581
}
582582
None => Err(~"Invalid day of week")
@@ -1025,7 +1025,6 @@ mod tests {
10251025
}
10261026

10271027
#[test]
1028-
#[ignore(reason = "randomred")]
10291028
fn test_strptime() {
10301029
os::setenv(~"TZ", ~"America/Los_Angeles");
10311030
tzset();

0 commit comments

Comments
 (0)