Skip to content

Commit ca93583

Browse files
committed
Fix incorrect error messages in the time library
1 parent 802d475 commit ca93583

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/libstd/time.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
460460
tm.tm_yday = v - 1_i32;
461461
Ok(pos)
462462
}
463-
None => Err(~"Invalid year")
463+
None => Err(~"Invalid day of year")
464464
}
465465
}
466466
'k' => {
@@ -554,7 +554,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
554554
tm.tm_wday = v;
555555
Ok(pos)
556556
}
557-
None => Err(~"Invalid weekday")
557+
None => Err(~"Invalid day of week")
558558
}
559559
}
560560
'v' => {
@@ -569,7 +569,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
569569
// FIXME (#2350): range check.
570570
match match_digits(s, pos, 1u, false) {
571571
Some(item) => { let (v, pos) = item; tm.tm_wday = v; Ok(pos) }
572-
None => Err(~"Invalid weekday")
572+
None => Err(~"Invalid day of week")
573573
}
574574
}
575575
//'X' {}
@@ -582,7 +582,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
582582
tm.tm_year = v - 1900_i32;
583583
Ok(pos)
584584
}
585-
None => Err(~"Invalid weekday")
585+
None => Err(~"Invalid year")
586586
}
587587
}
588588
'y' => {
@@ -593,7 +593,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
593593
tm.tm_year = v - 1900_i32;
594594
Ok(pos)
595595
}
596-
None => Err(~"Invalid weekday")
596+
None => Err(~"Invalid year")
597597
}
598598
}
599599
'Z' => {

0 commit comments

Comments
 (0)