@@ -315,7 +315,7 @@ impl Spec {
315315 match self {
316316 Self :: Char { width, align_left } => {
317317 let ( width, neg_width) =
318- resolve_asterisk_maybe_negative ( * width, & mut args) ? . unwrap_or_default ( ) ;
318+ resolve_asterisk_maybe_negative ( * width, & mut args) . unwrap_or_default ( ) ;
319319 write_padded ( writer, & [ args. get_char ( ) ] , width, * align_left || neg_width)
320320 }
321321 Self :: String {
@@ -324,15 +324,15 @@ impl Spec {
324324 precision,
325325 } => {
326326 let ( width, neg_width) =
327- resolve_asterisk_maybe_negative ( * width, & mut args) ? . unwrap_or_default ( ) ;
327+ resolve_asterisk_maybe_negative ( * width, & mut args) . unwrap_or_default ( ) ;
328328
329329 // GNU does do this truncation on a byte level, see for instance:
330330 // printf "%.1s" 🙃
331331 // > �
332332 // For now, we let printf panic when we truncate within a code point.
333333 // TODO: We need to not use Rust's formatting for aligning the output,
334334 // so that we can just write bytes to stdout without panicking.
335- let precision = resolve_asterisk ( * precision, & mut args) ? ;
335+ let precision = resolve_asterisk ( * precision, & mut args) ;
336336 let s = args. get_str ( ) ;
337337 let truncated = match precision {
338338 Some ( p) if p < s. len ( ) => & s[ ..p] ,
@@ -381,8 +381,8 @@ impl Spec {
381381 positive_sign,
382382 alignment,
383383 } => {
384- let width = resolve_asterisk ( * width, & mut args) ? . unwrap_or ( 0 ) ;
385- let precision = resolve_asterisk ( * precision, & mut args) ? . unwrap_or ( 0 ) ;
384+ let width = resolve_asterisk ( * width, & mut args) . unwrap_or ( 0 ) ;
385+ let precision = resolve_asterisk ( * precision, & mut args) . unwrap_or ( 0 ) ;
386386 let i = args. get_i64 ( ) ;
387387
388388 if precision as u64 > i32:: MAX as u64 {
@@ -404,8 +404,8 @@ impl Spec {
404404 precision,
405405 alignment,
406406 } => {
407- let width = resolve_asterisk ( * width, & mut args) ? . unwrap_or ( 0 ) ;
408- let precision = resolve_asterisk ( * precision, & mut args) ? . unwrap_or ( 0 ) ;
407+ let width = resolve_asterisk ( * width, & mut args) . unwrap_or ( 0 ) ;
408+ let precision = resolve_asterisk ( * precision, & mut args) . unwrap_or ( 0 ) ;
409409 let i = args. get_u64 ( ) ;
410410
411411 if precision as u64 > i32:: MAX as u64 {
@@ -430,8 +430,8 @@ impl Spec {
430430 alignment,
431431 precision,
432432 } => {
433- let width = resolve_asterisk ( * width, & mut args) ? . unwrap_or ( 0 ) ;
434- let precision = resolve_asterisk ( * precision, & mut args) ? . unwrap_or ( 6 ) ;
433+ let width = resolve_asterisk ( * width, & mut args) . unwrap_or ( 0 ) ;
434+ let precision = resolve_asterisk ( * precision, & mut args) . unwrap_or ( 6 ) ;
435435 let f = args. get_f64 ( ) ;
436436
437437 if precision as u64 > i32:: MAX as u64 {
@@ -457,19 +457,19 @@ impl Spec {
457457fn resolve_asterisk < ' a > (
458458 option : Option < CanAsterisk < usize > > ,
459459 mut args : impl ArgumentIter < ' a > ,
460- ) -> Result < Option < usize > , FormatError > {
461- Ok ( match option {
460+ ) -> Option < usize > {
461+ match option {
462462 None => None ,
463463 Some ( CanAsterisk :: Asterisk ) => Some ( usize:: try_from ( args. get_u64 ( ) ) . ok ( ) . unwrap_or ( 0 ) ) ,
464464 Some ( CanAsterisk :: Fixed ( w) ) => Some ( w) ,
465- } )
465+ }
466466}
467467
468468fn resolve_asterisk_maybe_negative < ' a > (
469469 option : Option < CanAsterisk < usize > > ,
470470 mut args : impl ArgumentIter < ' a > ,
471- ) -> Result < Option < ( usize , bool ) > , FormatError > {
472- Ok ( match option {
471+ ) -> Option < ( usize , bool ) > {
472+ match option {
473473 None => None ,
474474 Some ( CanAsterisk :: Asterisk ) => {
475475 let nb = args. get_i64 ( ) ;
@@ -480,7 +480,7 @@ fn resolve_asterisk_maybe_negative<'a>(
480480 }
481481 }
482482 Some ( CanAsterisk :: Fixed ( w) ) => Some ( ( w, false ) ) ,
483- } )
483+ }
484484}
485485
486486fn write_padded (
0 commit comments