File tree Expand file tree Collapse file tree 5 files changed +5
-23
lines changed Expand file tree Collapse file tree 5 files changed +5
-23
lines changed Original file line number Diff line number Diff line change @@ -56,11 +56,7 @@ impl InterceptorBuilder for GeneratorBuilder {
56
56
let ( close_tx, close_rx) = mpsc:: channel ( 1 ) ;
57
57
Ok ( Arc :: new ( Generator {
58
58
internal : Arc :: new ( GeneratorInternal {
59
- log2_size_minus_6 : if let Some ( log2_size_minus_6) = self . log2_size_minus_6 {
60
- log2_size_minus_6
61
- } else {
62
- 13 - 6 // 8192 = 1 << 13
63
- } ,
59
+ log2_size_minus_6 : self . log2_size_minus_6 . unwrap_or ( 13 - 6 ) , // 8192 = 1 << 13
64
60
skip_last_n : self . skip_last_n . unwrap_or_default ( ) ,
65
61
interval : if let Some ( interval) = self . interval {
66
62
interval
Original file line number Diff line number Diff line change @@ -38,11 +38,7 @@ impl InterceptorBuilder for ResponderBuilder {
38
38
fn build ( & self , _id : & str ) -> Result < Arc < dyn Interceptor + Send + Sync > > {
39
39
Ok ( Arc :: new ( Responder {
40
40
internal : Arc :: new ( ResponderInternal {
41
- log2_size : if let Some ( log2_size) = self . log2_size {
42
- log2_size
43
- } else {
44
- 13 // 8192 = 1 << 13
45
- } ,
41
+ log2_size : self . log2_size . unwrap_or ( 13 ) , // 8192 = 1 << 13
46
42
streams : Arc :: new ( Mutex :: new ( HashMap :: new ( ) ) ) ,
47
43
} ) ,
48
44
} ) )
Original file line number Diff line number Diff line change @@ -23,10 +23,7 @@ impl fmt::Display for RawPacket {
23
23
impl Packet for RawPacket {
24
24
/// Header returns the Header associated with this packet.
25
25
fn header ( & self ) -> Header {
26
- match Header :: unmarshal ( & mut self . 0 . clone ( ) ) {
27
- Ok ( h) => h,
28
- Err ( _) => Header :: default ( ) ,
29
- }
26
+ Header :: unmarshal ( & mut self . 0 . clone ( ) ) . unwrap_or_default ( )
30
27
}
31
28
32
29
/// destination_ssrc returns an array of SSRC values that this packet refers to.
Original file line number Diff line number Diff line change @@ -952,11 +952,7 @@ pub(crate) fn rand_seq(n: usize) -> String {
952
952
for b in & mut buf {
953
953
* b = letters[ rand:: random :: < usize > ( ) % letters. len ( ) ] ;
954
954
}
955
- if let Ok ( s) = String :: from_utf8 ( buf) {
956
- s
957
- } else {
958
- String :: new ( )
959
- }
955
+ String :: from_utf8 ( buf) . unwrap_or_default ( )
960
956
}
961
957
962
958
pub ( crate ) fn build_nonce ( ) -> Result < String > {
Original file line number Diff line number Diff line change @@ -445,10 +445,7 @@ impl Net {
445
445
446
446
Net :: VNet ( Arc :: new ( Mutex :: new ( vnet) ) )
447
447
} else {
448
- let interfaces = match ifaces:: ifaces ( ) {
449
- Ok ( ifs) => ifs,
450
- Err ( _) => vec ! [ ] ,
451
- } ;
448
+ let interfaces = ifaces:: ifaces ( ) . unwrap_or_default ( ) ;
452
449
453
450
let mut m: HashMap < String , Vec < IpNet > > = HashMap :: new ( ) ;
454
451
for iface in interfaces {
You can’t perform that action at this time.
0 commit comments