Skip to content

Commit 9d6840a

Browse files
committed
---
yaml --- r: 52441 b: refs/heads/dist-snap c: 93e969e h: refs/heads/master i: 52439: 245cf21 v: v3
1 parent bc6b765 commit 9d6840a

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
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: 2c870e40744b873bf3205af7b2057cf4f76c3d1f
10+
refs/heads/dist-snap: 93e969e356dc8908a7eeef675269149f81a10eed
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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