Skip to content

Commit 76f780a

Browse files
author
yngrtc
committed
fix clippy warning
1 parent 7d5ee0a commit 76f780a

File tree

5 files changed

+5
-23
lines changed

5 files changed

+5
-23
lines changed

interceptor/src/nack/generator/mod.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ impl InterceptorBuilder for GeneratorBuilder {
5656
let (close_tx, close_rx) = mpsc::channel(1);
5757
Ok(Arc::new(Generator {
5858
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
6460
skip_last_n: self.skip_last_n.unwrap_or_default(),
6561
interval: if let Some(interval) = self.interval {
6662
interval

interceptor/src/nack/responder/mod.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ impl InterceptorBuilder for ResponderBuilder {
3838
fn build(&self, _id: &str) -> Result<Arc<dyn Interceptor + Send + Sync>> {
3939
Ok(Arc::new(Responder {
4040
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
4642
streams: Arc::new(Mutex::new(HashMap::new())),
4743
}),
4844
}))

rtcp/src/raw_packet.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ impl fmt::Display for RawPacket {
2323
impl Packet for RawPacket {
2424
/// Header returns the Header associated with this packet.
2525
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()
3027
}
3128

3229
/// destination_ssrc returns an array of SSRC values that this packet refers to.

turn/src/server/request.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -952,11 +952,7 @@ pub(crate) fn rand_seq(n: usize) -> String {
952952
for b in &mut buf {
953953
*b = letters[rand::random::<usize>() % letters.len()];
954954
}
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()
960956
}
961957

962958
pub(crate) fn build_nonce() -> Result<String> {

util/src/vnet/net.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,7 @@ impl Net {
445445

446446
Net::VNet(Arc::new(Mutex::new(vnet)))
447447
} else {
448-
let interfaces = match ifaces::ifaces() {
449-
Ok(ifs) => ifs,
450-
Err(_) => vec![],
451-
};
448+
let interfaces = ifaces::ifaces().unwrap_or_default();
452449

453450
let mut m: HashMap<String, Vec<IpNet>> = HashMap::new();
454451
for iface in interfaces {

0 commit comments

Comments
 (0)