@@ -17,7 +17,7 @@ impl Interval {
1717 let delim = vec ! [ 'Y' , 'M' , 'D' , 'H' , 'S' ] ;
1818 let mut number = String :: new ( ) ;
1919 let mut interval_norm = IntervalNorm :: default ( ) ;
20- if iso_str. rfind ( 'P' ) . map_or ( false , |v| v == 1 ) {
20+ if iso_str. rfind ( 'P' ) == Some ( 1 ) {
2121 Err ( ParseError :: from_invalid_interval (
2222 "Invalid format must start with P." ,
2323 ) )
@@ -104,7 +104,7 @@ impl Interval {
104104fn consume_number < ' a > ( val : & ' a char , number : & ' a mut String , delim : & [ char ] ) -> ParserCode {
105105 let is_first_char = number. is_empty ( ) && * val == '-' ;
106106 let is_period_char = !number. is_empty ( ) && * val == '.' ;
107- if val. is_digit ( 10 ) || is_first_char || is_period_char {
107+ if val. is_ascii_digit ( ) || is_first_char || is_period_char {
108108 number. push ( * val) ;
109109 ParserCode :: Good
110110 } else if delim. contains ( val) {
@@ -116,7 +116,7 @@ fn consume_number<'a>(val: &'a char, number: &'a mut String, delim: &[char]) ->
116116
117117fn parse_number ( number : & mut String ) -> Result < f64 , ParseError > {
118118 let parse_num = number. parse :: < f64 > ( ) ?;
119- if parse_num > i32:: max_value ( ) as f64 {
119+ if parse_num > i32:: MAX as f64 {
120120 Err ( ParseError :: from_invalid_interval ( "Exceeded max value" ) )
121121 } else {
122122 * number = "" . to_owned ( ) ;
@@ -257,19 +257,19 @@ mod tests {
257257 #[ test]
258258 fn test_from_8601_19 ( ) {
259259 let interval = Interval :: from_iso ( "PTT" ) ;
260- assert_eq ! ( interval. is_err( ) , true ) ;
260+ assert ! ( interval. is_err( ) ) ;
261261 }
262262
263263 #[ test]
264264 fn test_from_8601_20 ( ) {
265265 let interval = Interval :: from_iso ( "PT-" ) ;
266- assert_eq ! ( interval. is_err( ) , true ) ;
266+ assert ! ( interval. is_err( ) ) ;
267267 }
268268
269269 #[ test]
270270 fn test_from_8601_21 ( ) {
271271 let interval = Interval :: from_iso ( "PT10" ) ;
272- assert_eq ! ( interval. is_err( ) , true ) ;
272+ assert ! ( interval. is_err( ) ) ;
273273 }
274274
275275 #[ test]
0 commit comments