@@ -229,9 +229,11 @@ impl Component {
229229 ) ] ]
230230 }
231231 PacketLen ( ops) => {
232- let ops = ( afi == Afi :: Ipv4 )
233- . then ( || Cow :: Borrowed ( ops) )
234- . unwrap_or_else ( || Cow :: Owned ( ops. with_offset ( -40 ) ) ) ;
232+ let ops = if afi == Afi :: Ipv4 {
233+ Cow :: Borrowed ( ops)
234+ } else {
235+ Cow :: Owned ( ops. with_offset ( -40 ) )
236+ } ;
235237 range_stmt_branch ( make_payload_field ( ip_ver, "length" ) , & ops, 0xffff ) ?
236238 }
237239 Dscp ( ops) => range_stmt_branch ( make_payload_field ( ip_ver, "dscp" ) , ops, 0x3f ) ?,
@@ -248,12 +250,16 @@ impl Component {
248250 let mut iter = new_set. into_iter ( ) . peekable ( ) ;
249251 let mut branch = StatementBranch :: new ( ) ;
250252
251- let frag_off = ( afi == Afi :: Ipv4 )
252- . then ( || make_payload_field ( "ip" , "frag-off" ) )
253- . unwrap_or_else ( || make_exthdr ( "frag" , "frag-off" , 0 ) ) ;
254- let mf = ( afi == Afi :: Ipv4 )
255- . then ( || make_payload_raw ( expr:: PayloadBase :: NH , 18 , 1 ) )
256- . unwrap_or_else ( || make_exthdr ( "frag" , "more-fragments" , 0 ) ) ;
253+ let frag_off = if afi == Afi :: Ipv4 {
254+ make_payload_field ( "ip" , "frag-off" )
255+ } else {
256+ make_exthdr ( "frag" , "frag-off" , 0 )
257+ } ;
258+ let mf = if afi == Afi :: Ipv4 {
259+ make_payload_raw ( expr:: PayloadBase :: NH , 18 , 1 )
260+ } else {
261+ make_exthdr ( "frag" , "more-fragments" , 0 )
262+ } ;
257263
258264 // DF (IPv4)
259265 if let Some ( 0b0001 ) = iter. peek ( ) {
0 commit comments