Skip to content

Commit 7e1e056

Browse files
authored
Merge pull request #189 from cakebaker/clippy_fix_warnings_from_rust_1_89
clippy: fix warnings introduced with Rust `1.89`
2 parents 78a6aef + a4d31ca commit 7e1e056

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/uu/hostname/src/net/unix.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ impl InterfaceAddresses {
240240
}
241241
}
242242

243-
pub(crate) fn iter(&self) -> InterfaceAddressesIter {
243+
pub(crate) fn iter(&self) -> InterfaceAddressesIter<'_> {
244244
InterfaceAddressesIter {
245245
_ia: self,
246246
ptr: Some(self.0),
@@ -304,7 +304,7 @@ impl AddressInfo {
304304
unsafe { self.0.as_ref() }
305305
}
306306

307-
pub(crate) fn iter(&self) -> AddressInfoIter {
307+
pub(crate) fn iter(&self) -> AddressInfoIter<'_> {
308308
AddressInfoIter {
309309
_ia: self,
310310
ptr: Some(self.0),

src/uu/hostname/src/net/windows.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ impl InterfaceAddresses {
241241
}
242242
}
243243

244-
pub(crate) fn iter(&self) -> InterfaceAddressesIter {
244+
pub(crate) fn iter(&self) -> InterfaceAddressesIter<'_> {
245245
InterfaceAddressesIter {
246246
_ia: self,
247247
ptr: self.list,
@@ -337,7 +337,7 @@ impl AddressInfo {
337337
}
338338
}
339339

340-
pub(crate) fn iter(&self) -> AddressInfoIter {
340+
pub(crate) fn iter(&self) -> AddressInfoIter<'_> {
341341
AddressInfoIter {
342342
_ia: self,
343343
ptr: Some(self.0),

src/uu/hostname/src/utils.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ pub(crate) fn parse_host_name_file(path: &Path) -> UResult<Vec<u8>> {
88

99
let first_byte = loop {
1010
let mut first_byte = [0_u8; 1];
11-
if let Err(err) = file.read_exact(&mut first_byte) {
12-
if err.kind() == std::io::ErrorKind::UnexpectedEof {
13-
return Ok(Vec::default()); // Empty name.
14-
}
11+
if let Err(err) = file.read_exact(&mut first_byte)
12+
&& err.kind() == std::io::ErrorKind::UnexpectedEof
13+
{
14+
return Ok(Vec::default()); // Empty name.
1515
}
1616

1717
match first_byte[0] {

0 commit comments

Comments
 (0)