auto merge of #9734 : luisbg/rust/master, r=alexcrichton

bors · bors · commit 549f70989e34 · 2013-10-05T17:26:35.000-07:00
These formats are already covered with 'T' | 'X' in line 571 and 'D' | 'x' in
line 446.
diff --git a/src/libextra/time.rs b/src/libextra/time.rs
@@ -600,8 +600,6 @@ pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {
               None => Err(~"Invalid day of week")
             }
           }
-          //'X' {}
-          //'x' {}
           'Y' => {
             match match_digits(s, pos, 4u, false) {
               Some(item) => {

Original file line number	Diff line number	Diff line change
`@@ -600,8 +600,6 @@ pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {`
`600`	`600`	`None => Err(~"Invalid day of week")`
`601`	`601`	`}`
`602`	`602`	`}`
`603`		`- //'X' {}`
`604`		`- //'x' {}`
`605`	`603`	`'Y' => {`
`606`	`604`	`match match_digits(s, pos, 4u, false) {`
`607`	`605`	`Some(item) => {`