Skip to content

Commit 7dda148

Browse files
JakkuSakuraDirbaio
JakkuSakura
authored and
Dirbaio
committed
various clippy fix
1 parent 750fcb1 commit 7dda148

File tree

12 files changed

+31
-33
lines changed

12 files changed

+31
-33
lines changed

‎src/iface/interface.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ impl<'a> InterfaceInner<'a> {
10821082

10831083
// Pass every IP packet to all raw sockets we have registered.
10841084
for mut raw_socket in sockets.iter_mut().filter_map(RawSocket::downcast) {
1085-
if !raw_socket.accepts(&ip_repr) {
1085+
if !raw_socket.accepts(ip_repr) {
10861086
continue;
10871087
}
10881088

@@ -1105,7 +1105,7 @@ impl<'a> InterfaceInner<'a> {
11051105
sockets: &mut SocketSet,
11061106
ipv6_packet: &Ipv6Packet<&'frame T>,
11071107
) -> Result<Option<IpPacket<'frame>>> {
1108-
let ipv6_repr = Ipv6Repr::parse(&ipv6_packet)?;
1108+
let ipv6_repr = Ipv6Repr::parse(ipv6_packet)?;
11091109

11101110
if !ipv6_repr.src_addr.is_unicast() {
11111111
// Discard packets with non-unicast source addresses.

‎src/parsers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ impl FromStr for IpEndpoint {
472472
type Err = ();
473473

474474
fn from_str(s: &str) -> Result<IpEndpoint> {
475-
Parser::new(s).until_eof(|p| Ok(p.accept_ip_endpoint()?))
475+
Parser::new(s).until_eof(|p| p.accept_ip_endpoint())
476476
}
477477
}
478478

‎src/phy/fault_injector.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl<D: for<'a> Device<'a>> FaultInjector<D> {
111111
rx_bucket: 0,
112112
};
113113
FaultInjector {
114-
inner: inner,
114+
inner,
115115
state: RefCell::new(state),
116116
config: Config::default(),
117117
}
@@ -219,14 +219,14 @@ where
219219
} = self;
220220
inner.receive().map(|(rx_token, tx_token)| {
221221
let rx = RxToken {
222-
state: &state,
223-
config: config,
222+
state,
223+
config,
224224
token: rx_token,
225225
corrupt: [0; MTU],
226226
};
227227
let tx = TxToken {
228-
state: &state,
229-
config: config,
228+
state,
229+
config,
230230
token: tx_token,
231231
junk: [0; MTU],
232232
};
@@ -241,9 +241,9 @@ where
241241
config,
242242
} = self;
243243
inner.transmit().map(|token| TxToken {
244-
state: &state,
245-
config: config,
246-
token: token,
244+
state,
245+
config,
246+
token,
247247
junk: [0; MTU],
248248
})
249249
}

‎src/phy/pcap_writer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl<Tx: phy::TxToken, S: PcapSink> phy::TxToken for TxToken<Tx, S> {
229229
token.consume(timestamp, len, |buffer| {
230230
let result = f(buffer);
231231
match mode {
232-
PcapMode::Both | PcapMode::TxOnly => sink.packet(timestamp, &buffer),
232+
PcapMode::Both | PcapMode::TxOnly => sink.packet(timestamp, buffer),
233233
PcapMode::RxOnly => (),
234234
};
235235
result

‎src/phy/tracer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ impl<'a> fmt::Display for Packet<'a> {
171171
&mut indent,
172172
),
173173
#[cfg(feature = "medium-ip")]
174-
Medium::Ip => match crate::wire::IpVersion::of_packet(&self.buffer) {
174+
Medium::Ip => match crate::wire::IpVersion::of_packet(self.buffer) {
175175
#[cfg(feature = "proto-ipv4")]
176176
Ok(crate::wire::IpVersion::Ipv4) => {
177177
crate::wire::Ipv4Packet::<&'static [u8]>::pretty_print(

‎src/socket/dhcpv4.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,11 @@ impl Dhcpv4Socket {
307307
let mut dns_servers = [None; DHCP_MAX_DNS_SERVER_COUNT];
308308
if let Some(received) = dhcp_repr.dns_servers {
309309
let mut i = 0;
310-
for addr in received.iter() {
311-
if let Some(addr) = addr {
312-
if addr.is_unicast() {
313-
// This can never be out-of-bounds since both arrays have length DHCP_MAX_DNS_SERVER_COUNT
314-
dns_servers[i] = Some(*addr);
315-
i += 1;
316-
}
310+
for addr in received.iter().flatten() {
311+
if addr.is_unicast() {
312+
// This can never be out-of-bounds since both arrays have length DHCP_MAX_DNS_SERVER_COUNT
313+
dns_servers[i] = Some(*addr);
314+
i += 1;
317315
}
318316
}
319317
}

‎src/socket/set.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ impl<'a, 'b: 'a> Iterator for Iter<'a, 'b> {
201201
type Item = &'a Socket<'b>;
202202

203203
fn next(&mut self) -> Option<Self::Item> {
204-
while let Some(item_opt) = self.lower.next() {
204+
for item_opt in &mut self.lower {
205205
if let Some(item) = item_opt.as_ref() {
206206
return Some(&item.socket);
207207
}
@@ -222,7 +222,7 @@ impl<'a, 'b: 'a> Iterator for IterMut<'a, 'b> {
222222
type Item = SocketRef<'a, Socket<'b>>;
223223

224224
fn next(&mut self) -> Option<Self::Item> {
225-
while let Some(item_opt) = self.lower.next() {
225+
for item_opt in &mut self.lower {
226226
if let Some(item) = item_opt.as_mut() {
227227
return Some(SocketRef::new(&mut item.socket));
228228
}

‎src/socket/tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ impl<'a> TcpSocket<'a> {
14241424
ack_min,
14251425
ack_max
14261426
);
1427-
return Ok(Some(self.ack_reply(ip_repr, &repr)));
1427+
return Ok(Some(self.ack_reply(ip_repr, repr)));
14281428
}
14291429
}
14301430
}

‎src/wire/icmpv4.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ impl<'a> Repr<'a> {
485485
let mut ip_packet = Ipv4Packet::new_unchecked(packet.data_mut());
486486
header.emit(&mut ip_packet, checksum_caps);
487487
let payload = &mut ip_packet.into_inner()[header.buffer_len()..];
488-
payload.copy_from_slice(&data[..])
488+
payload.copy_from_slice(data)
489489
}
490490
}
491491

‎src/wire/icmpv6.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ impl<'a> Repr<'a> {
657657
let mut ip_packet = Ipv6Packet::new_unchecked(buffer);
658658
header.emit(&mut ip_packet);
659659
let payload = &mut ip_packet.into_inner()[header.buffer_len()..];
660-
payload.copy_from_slice(&data[..]);
660+
payload.copy_from_slice(data);
661661
}
662662

663663
match *self {
@@ -669,15 +669,15 @@ impl<'a> Repr<'a> {
669669
packet.set_msg_type(Message::DstUnreachable);
670670
packet.set_msg_code(reason.into());
671671

672-
emit_contained_packet(packet.payload_mut(), header, &data);
672+
emit_contained_packet(packet.payload_mut(), header, data);
673673
}
674674

675675
Repr::PktTooBig { mtu, header, data } => {
676676
packet.set_msg_type(Message::PktTooBig);
677677
packet.set_msg_code(0);
678678
packet.set_pkt_too_big_mtu(mtu);
679679

680-
emit_contained_packet(packet.payload_mut(), header, &data);
680+
emit_contained_packet(packet.payload_mut(), header, data);
681681
}
682682

683683
Repr::TimeExceeded {
@@ -688,7 +688,7 @@ impl<'a> Repr<'a> {
688688
packet.set_msg_type(Message::TimeExceeded);
689689
packet.set_msg_code(reason.into());
690690

691-
emit_contained_packet(packet.payload_mut(), header, &data);
691+
emit_contained_packet(packet.payload_mut(), header, data);
692692
}
693693

694694
Repr::ParamProblem {
@@ -701,7 +701,7 @@ impl<'a> Repr<'a> {
701701
packet.set_msg_code(reason.into());
702702
packet.set_param_problem_ptr(pointer);
703703

704-
emit_contained_packet(packet.payload_mut(), header, &data);
704+
emit_contained_packet(packet.payload_mut(), header, data);
705705
}
706706

707707
Repr::EchoRequest {

0 commit comments

Comments
 (0)