Skip to content

Commit 36def24

Browse files
committed
Fully convert Parsed::set_* to new error type
1 parent 83ea30f commit 36def24

File tree

2 files changed

+163
-148
lines changed

2 files changed

+163
-148
lines changed

src/format/parse.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use super::{Fixed, InternalFixed, InternalInternal, Item, Numeric, Pad, Parsed};
1414
use super::{BAD_FORMAT, INVALID, OUT_OF_RANGE, TOO_LONG, TOO_SHORT};
1515
use crate::{DateTime, Error, FixedOffset, Weekday};
1616

17-
fn set_weekday_with_num_days_from_sunday(p: &mut Parsed, v: i64) -> ParseResult<&mut Parsed> {
17+
fn set_weekday_with_num_days_from_sunday(p: &mut Parsed, v: i64) -> Result<&mut Parsed, Error> {
1818
p.set_weekday(match v {
1919
0 => Weekday::Sun,
2020
1 => Weekday::Mon,
@@ -23,11 +23,11 @@ fn set_weekday_with_num_days_from_sunday(p: &mut Parsed, v: i64) -> ParseResult<
2323
4 => Weekday::Thu,
2424
5 => Weekday::Fri,
2525
6 => Weekday::Sat,
26-
_ => return Err(OUT_OF_RANGE),
26+
_ => return Err(Error::InvalidArgument),
2727
})
2828
}
2929

30-
fn set_weekday_with_number_from_monday(p: &mut Parsed, v: i64) -> ParseResult<&mut Parsed> {
30+
fn set_weekday_with_number_from_monday(p: &mut Parsed, v: i64) -> Result<&mut Parsed, Error> {
3131
p.set_weekday(match v {
3232
1 => Weekday::Mon,
3333
2 => Weekday::Tue,
@@ -36,7 +36,7 @@ fn set_weekday_with_number_from_monday(p: &mut Parsed, v: i64) -> ParseResult<&m
3636
5 => Weekday::Fri,
3737
6 => Weekday::Sat,
3838
7 => Weekday::Sun,
39-
_ => return Err(OUT_OF_RANGE),
39+
_ => return Err(Error::InvalidArgument),
4040
})
4141
}
4242

@@ -339,7 +339,7 @@ where
339339

340340
Item::Numeric(ref spec, ref _pad) => {
341341
use super::Numeric::*;
342-
type Setter = fn(&mut Parsed, i64) -> ParseResult<&mut Parsed>;
342+
type Setter = fn(&mut Parsed, i64) -> Result<&mut Parsed, Error>;
343343

344344
let (width, signed, set): (usize, bool, Setter) = match *spec {
345345
Year => (4, true, Parsed::set_year),

0 commit comments

Comments
 (0)