Skip to content

Commit 7160c3a

Browse files
committed
Remove let-else
1 parent a7da4c5 commit 7160c3a

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

src/backend/libc/net/netdevice.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ pub(crate) fn index_to_name(index: u32) -> io::Result<String> {
4343
let fd = open_socket()?;
4444
unsafe { ioctl(fd.as_fd(), SIOCGIFNAME as _, &mut ifreq as *mut ifreq as _) }?;
4545

46-
let Some(nul_byte) = ifreq.ifr_name.iter().position(|char| *char == 0) else {
47-
return Err(io::Errno::INVAL);
48-
};
49-
let name: String = ifreq.ifr_name[..nul_byte]
50-
.iter()
51-
.map(|v| *v as u8 as char)
52-
.collect();
53-
54-
Ok(name)
46+
if let Some(nul_byte) = ifreq.ifr_name.iter().position(|char| *char == 0) {
47+
let name: String = ifreq.ifr_name[..nul_byte]
48+
.iter()
49+
.map(|v| *v as u8 as char)
50+
.collect();
51+
52+
Ok(name)
53+
} else {
54+
Err(io::Errno::INVAL)
55+
}
5556
}

src/backend/linux_raw/net/netdevice.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ pub(crate) fn index_to_name(index: u32) -> io::Result<String> {
4242
let fd = open_socket()?;
4343
unsafe { ioctl(fd.as_fd(), SIOCGIFNAME, &mut ifreq as *mut ifreq as _) }?;
4444

45-
let Some(nul_byte) = unsafe { ifreq.ifr_ifrn.ifrn_name }
45+
if let Some(nul_byte) = unsafe { ifreq.ifr_ifrn.ifrn_name }
4646
.iter()
4747
.position(|char| *char == 0)
48-
else {
49-
return Err(io::Errno::INVAL);
50-
};
51-
52-
let name = unsafe { ifreq.ifr_ifrn.ifrn_name }[..nul_byte]
53-
.iter()
54-
.map(|v| *v as char)
55-
.collect();
56-
57-
Ok(name)
48+
{
49+
let name = unsafe { ifreq.ifr_ifrn.ifrn_name }[..nul_byte]
50+
.iter()
51+
.map(|v| *v as char)
52+
.collect();
53+
54+
Ok(name)
55+
} else {
56+
Err(io::Errno::INVAL)
57+
}
5858
}

0 commit comments

Comments
 (0)