File tree Expand file tree Collapse file tree 2 files changed +3
-15
lines changed Expand file tree Collapse file tree 2 files changed +3
-15
lines changed Original file line number Diff line number Diff line change @@ -630,7 +630,7 @@ impl<'btf> BtfType<'btf> {
630
630
let int = types:: Int :: try_from ( skipped) . unwrap ( ) ;
631
631
Ok ( Ord :: min (
632
632
ptr_size,
633
- NonZeroUsize :: new ( ( ( int. bits + 7 ) / 8 ) . into ( ) ) . unwrap ( ) ,
633
+ NonZeroUsize :: new ( usize :: from ( int. bits . div_ceil ( 8 ) ) ) . unwrap ( ) ,
634
634
) )
635
635
}
636
636
BtfKind :: Ptr => skipped. source . ptr_size ( ) ,
Original file line number Diff line number Diff line change @@ -448,14 +448,8 @@ impl Iterator for ProgInfoIter {
448
448
449
449
fn next ( & mut self ) -> Option < Self :: Item > {
450
450
let fd = self . next_valid_fd ( ) ?;
451
-
452
451
let prog = ProgramInfo :: load_from_fd ( fd. as_fd ( ) , & self . opts ) ;
453
-
454
- match prog {
455
- Ok ( p) => Some ( p) ,
456
- // TODO: We should consider bubbling up errors properly.
457
- Err ( _err) => None ,
458
- }
452
+ prog. ok ( )
459
453
}
460
454
}
461
455
@@ -612,14 +606,8 @@ impl Iterator for BtfInfoIter {
612
606
613
607
fn next ( & mut self ) -> Option < Self :: Item > {
614
608
let fd = self . next_valid_fd ( ) ?;
615
-
616
609
let info = BtfInfo :: load_from_fd ( fd. as_fd ( ) ) ;
617
-
618
- match info {
619
- Ok ( i) => Some ( i) ,
620
- // TODO: We should consider bubbling up errors properly.
621
- Err ( _err) => None ,
622
- }
610
+ info. ok ( )
623
611
}
624
612
}
625
613
You can’t perform that action at this time.
0 commit comments