Skip to content

Commit

Permalink
Fix incorrect error messages in the time library
Browse files Browse the repository at this point in the history
  • Loading branch information
ScriptDevil committed Jan 13, 2013
1 parent 802d475 commit ca93583
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/libstd/time.rs
Expand Up @@ -460,7 +460,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
tm.tm_yday = v - 1_i32;
Ok(pos)
}
None => Err(~"Invalid year")
None => Err(~"Invalid day of year")
}
}
'k' => {
Expand Down Expand Up @@ -554,7 +554,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
tm.tm_wday = v;
Ok(pos)
}
None => Err(~"Invalid weekday")
None => Err(~"Invalid day of week")
}
}
'v' => {
Expand All @@ -569,7 +569,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
// FIXME (#2350): range check.
match match_digits(s, pos, 1u, false) {
Some(item) => { let (v, pos) = item; tm.tm_wday = v; Ok(pos) }
None => Err(~"Invalid weekday")
None => Err(~"Invalid day of week")
}
}
//'X' {}
Expand All @@ -582,7 +582,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
tm.tm_year = v - 1900_i32;
Ok(pos)
}
None => Err(~"Invalid weekday")
None => Err(~"Invalid year")
}
}
'y' => {
Expand All @@ -593,7 +593,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
tm.tm_year = v - 1900_i32;
Ok(pos)
}
None => Err(~"Invalid weekday")
None => Err(~"Invalid year")
}
}
'Z' => {
Expand Down

0 comments on commit ca93583

Please sign in to comment.