@@ -14,7 +14,7 @@ use super::{Fixed, InternalFixed, InternalInternal, Item, Numeric, Pad, Parsed};
14
14
use super :: { BAD_FORMAT , INVALID , OUT_OF_RANGE , TOO_LONG , TOO_SHORT } ;
15
15
use crate :: { DateTime , Error , FixedOffset , Weekday } ;
16
16
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 > {
18
18
p. set_weekday ( match v {
19
19
0 => Weekday :: Sun ,
20
20
1 => Weekday :: Mon ,
@@ -23,11 +23,11 @@ fn set_weekday_with_num_days_from_sunday(p: &mut Parsed, v: i64) -> ParseResult<
23
23
4 => Weekday :: Thu ,
24
24
5 => Weekday :: Fri ,
25
25
6 => Weekday :: Sat ,
26
- _ => return Err ( OUT_OF_RANGE ) ,
26
+ _ => return Err ( Error :: InvalidArgument ) ,
27
27
} )
28
28
}
29
29
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 > {
31
31
p. set_weekday ( match v {
32
32
1 => Weekday :: Mon ,
33
33
2 => Weekday :: Tue ,
@@ -36,7 +36,7 @@ fn set_weekday_with_number_from_monday(p: &mut Parsed, v: i64) -> ParseResult<&m
36
36
5 => Weekday :: Fri ,
37
37
6 => Weekday :: Sat ,
38
38
7 => Weekday :: Sun ,
39
- _ => return Err ( OUT_OF_RANGE ) ,
39
+ _ => return Err ( Error :: InvalidArgument ) ,
40
40
} )
41
41
}
42
42
@@ -339,7 +339,7 @@ where
339
339
340
340
Item :: Numeric ( ref spec, ref _pad) => {
341
341
use super :: Numeric :: * ;
342
- type Setter = fn ( & mut Parsed , i64 ) -> ParseResult < & mut Parsed > ;
342
+ type Setter = fn ( & mut Parsed , i64 ) -> Result < & mut Parsed , Error > ;
343
343
344
344
let ( width, signed, set) : ( usize , bool , Setter ) = match * spec {
345
345
Year => ( 4 , true , Parsed :: set_year) ,
0 commit comments