Skip to content

Commit 16e6e70

Browse files
whitequarkwhitequark
committedSep 25, 2017
Fix many warnings.
·
v0.12.0v0.5.0
1 parent cedf66a commit 16e6e70

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed
 

‎examples/ping.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern crate byteorder;
77

88
mod utils;
99

10-
use std::str::{self, FromStr};
10+
use std::str::FromStr;
1111
use std::time::Instant;
1212
use std::os::unix::io::AsRawFd;
1313
use smoltcp::phy::wait as phy_wait;

‎src/phy/fault_injector.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl State {
4040
}
4141

4242
fn corrupt<T: AsMut<[u8]>>(&mut self, mut buffer: T) {
43-
let mut buffer = buffer.as_mut();
43+
let buffer = buffer.as_mut();
4444
// We introduce a single bitflip, as the most likely, and the hardest to detect, error.
4545
let index = (xorshift32(&mut self.rng_seed) as usize) % buffer.len();
4646
let bit = 1 << (xorshift32(&mut self.rng_seed) % 8) as u8;

‎src/storage/ring_buffer.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -553,15 +553,15 @@ mod test {
553553
assert_eq!(ring.enqueue_slice(b"abcdefghijkl"), 12);
554554

555555
{
556-
let mut buf = ring.dequeue_many(8);
556+
let buf = ring.dequeue_many(8);
557557
assert_eq!(buf, b"abcdefgh");
558558
buf.copy_from_slice(b"........");
559559
}
560560
assert_eq!(ring.len(), 4);
561561
assert_eq!(&ring.storage[..], b"........ijkl");
562562

563563
{
564-
let mut buf = ring.dequeue_many(8);
564+
let buf = ring.dequeue_many(8);
565565
assert_eq!(buf, b"ijkl");
566566
buf.copy_from_slice(b"....");
567567
}

‎src/wire/icmpv4.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -300,21 +300,21 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
300300
/// Set the message type field.
301301
#[inline]
302302
pub fn set_msg_type(&mut self, value: Message) {
303-
let mut data = self.buffer.as_mut();
303+
let data = self.buffer.as_mut();
304304
data[field::TYPE] = value.into()
305305
}
306306

307307
/// Set the message code field.
308308
#[inline]
309309
pub fn set_msg_code(&mut self, value: u8) {
310-
let mut data = self.buffer.as_mut();
310+
let data = self.buffer.as_mut();
311311
data[field::CODE] = value
312312
}
313313

314314
/// Set the checksum field.
315315
#[inline]
316316
pub fn set_checksum(&mut self, value: u16) {
317-
let mut data = self.buffer.as_mut();
317+
let data = self.buffer.as_mut();
318318
NetworkEndian::write_u16(&mut data[field::CHECKSUM], value)
319319
}
320320

@@ -324,7 +324,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
324324
/// This function may panic if this packet is not an echo request or reply packet.
325325
#[inline]
326326
pub fn set_echo_ident(&mut self, value: u16) {
327-
let mut data = self.buffer.as_mut();
327+
let data = self.buffer.as_mut();
328328
NetworkEndian::write_u16(&mut data[field::ECHO_IDENT], value)
329329
}
330330

@@ -334,7 +334,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
334334
/// This function may panic if this packet is not an echo request or reply packet.
335335
#[inline]
336336
pub fn set_echo_seq_no(&mut self, value: u16) {
337-
let mut data = self.buffer.as_mut();
337+
let data = self.buffer.as_mut();
338338
NetworkEndian::write_u16(&mut data[field::ECHO_SEQNO], value)
339339
}
340340

@@ -354,7 +354,7 @@ impl<'a, T: AsRef<[u8]> + AsMut<[u8]> + ?Sized> Packet<&'a mut T> {
354354
#[inline]
355355
pub fn data_mut(&mut self) -> &mut [u8] {
356356
let range = self.header_len()..;
357-
let mut data = self.buffer.as_mut();
357+
let data = self.buffer.as_mut();
358358
&mut data[range]
359359
}
360360
}
@@ -468,7 +468,7 @@ impl<'a> Repr<'a> {
468468

469469
let mut ip_packet = Ipv4Packet::new(packet.data_mut());
470470
header.emit(&mut ip_packet);
471-
let mut payload = &mut ip_packet.into_inner()[header.buffer_len()..];
471+
let payload = &mut ip_packet.into_inner()[header.buffer_len()..];
472472
payload.copy_from_slice(&data[..])
473473
}
474474

‎src/wire/tcp.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -325,28 +325,28 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
325325
/// Set the source port field.
326326
#[inline]
327327
pub fn set_src_port(&mut self, value: u16) {
328-
let mut data = self.buffer.as_mut();
328+
let data = self.buffer.as_mut();
329329
NetworkEndian::write_u16(&mut data[field::SRC_PORT], value)
330330
}
331331

332332
/// Set the destination port field.
333333
#[inline]
334334
pub fn set_dst_port(&mut self, value: u16) {
335-
let mut data = self.buffer.as_mut();
335+
let data = self.buffer.as_mut();
336336
NetworkEndian::write_u16(&mut data[field::DST_PORT], value)
337337
}
338338

339339
/// Set the sequence number field.
340340
#[inline]
341341
pub fn set_seq_number(&mut self, value: SeqNumber) {
342-
let mut data = self.buffer.as_mut();
342+
let data = self.buffer.as_mut();
343343
NetworkEndian::write_i32(&mut data[field::SEQ_NUM], value.0)
344344
}
345345

346346
/// Set the acknowledgement number field.
347347
#[inline]
348348
pub fn set_ack_number(&mut self, value: SeqNumber) {
349-
let mut data = self.buffer.as_mut();
349+
let data = self.buffer.as_mut();
350350
NetworkEndian::write_i32(&mut data[field::ACK_NUM], value.0)
351351
}
352352

@@ -362,7 +362,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
362362
/// Set the FIN flag.
363363
#[inline]
364364
pub fn set_fin(&mut self, value: bool) {
365-
let mut data = self.buffer.as_mut();
365+
let data = self.buffer.as_mut();
366366
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
367367
let raw = if value { raw | field::FLG_FIN } else { raw & !field::FLG_FIN };
368368
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -371,7 +371,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
371371
/// Set the SYN flag.
372372
#[inline]
373373
pub fn set_syn(&mut self, value: bool) {
374-
let mut data = self.buffer.as_mut();
374+
let data = self.buffer.as_mut();
375375
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
376376
let raw = if value { raw | field::FLG_SYN } else { raw & !field::FLG_SYN };
377377
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -380,7 +380,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
380380
/// Set the RST flag.
381381
#[inline]
382382
pub fn set_rst(&mut self, value: bool) {
383-
let mut data = self.buffer.as_mut();
383+
let data = self.buffer.as_mut();
384384
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
385385
let raw = if value { raw | field::FLG_RST } else { raw & !field::FLG_RST };
386386
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -389,7 +389,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
389389
/// Set the PSH flag.
390390
#[inline]
391391
pub fn set_psh(&mut self, value: bool) {
392-
let mut data = self.buffer.as_mut();
392+
let data = self.buffer.as_mut();
393393
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
394394
let raw = if value { raw | field::FLG_PSH } else { raw & !field::FLG_PSH };
395395
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -398,7 +398,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
398398
/// Set the ACK flag.
399399
#[inline]
400400
pub fn set_ack(&mut self, value: bool) {
401-
let mut data = self.buffer.as_mut();
401+
let data = self.buffer.as_mut();
402402
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
403403
let raw = if value { raw | field::FLG_ACK } else { raw & !field::FLG_ACK };
404404
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -407,7 +407,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
407407
/// Set the URG flag.
408408
#[inline]
409409
pub fn set_urg(&mut self, value: bool) {
410-
let mut data = self.buffer.as_mut();
410+
let data = self.buffer.as_mut();
411411
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
412412
let raw = if value { raw | field::FLG_URG } else { raw & !field::FLG_URG };
413413
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -416,7 +416,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
416416
/// Set the ECE flag.
417417
#[inline]
418418
pub fn set_ece(&mut self, value: bool) {
419-
let mut data = self.buffer.as_mut();
419+
let data = self.buffer.as_mut();
420420
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
421421
let raw = if value { raw | field::FLG_ECE } else { raw & !field::FLG_ECE };
422422
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -425,7 +425,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
425425
/// Set the CWR flag.
426426
#[inline]
427427
pub fn set_cwr(&mut self, value: bool) {
428-
let mut data = self.buffer.as_mut();
428+
let data = self.buffer.as_mut();
429429
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
430430
let raw = if value { raw | field::FLG_CWR } else { raw & !field::FLG_CWR };
431431
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -434,7 +434,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
434434
/// Set the NS flag.
435435
#[inline]
436436
pub fn set_ns(&mut self, value: bool) {
437-
let mut data = self.buffer.as_mut();
437+
let data = self.buffer.as_mut();
438438
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
439439
let raw = if value { raw | field::FLG_NS } else { raw & !field::FLG_NS };
440440
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -443,7 +443,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
443443
/// Set the header length, in octets.
444444
#[inline]
445445
pub fn set_header_len(&mut self, value: u8) {
446-
let mut data = self.buffer.as_mut();
446+
let data = self.buffer.as_mut();
447447
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
448448
let raw = (raw & !0xf000) | ((value as u16) / 4) << 12;
449449
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@@ -452,21 +452,21 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
452452
/// Return the window size field.
453453
#[inline]
454454
pub fn set_window_len(&mut self, value: u16) {
455-
let mut data = self.buffer.as_mut();
455+
let data = self.buffer.as_mut();
456456
NetworkEndian::write_u16(&mut data[field::WIN_SIZE], value)
457457
}
458458

459459
/// Set the checksum field.
460460
#[inline]
461461
pub fn set_checksum(&mut self, value: u16) {
462-
let mut data = self.buffer.as_mut();
462+
let data = self.buffer.as_mut();
463463
NetworkEndian::write_u16(&mut data[field::CHECKSUM], value)
464464
}
465465

466466
/// Set the urgent pointer field.
467467
#[inline]
468468
pub fn set_urgent_at(&mut self, value: u16) {
469-
let mut data = self.buffer.as_mut();
469+
let data = self.buffer.as_mut();
470470
NetworkEndian::write_u16(&mut data[field::URGENT], value)
471471
}
472472

@@ -502,7 +502,7 @@ impl<'a, T: AsRef<[u8]> + AsMut<[u8]> + ?Sized> Packet<&'a mut T> {
502502
#[inline]
503503
pub fn payload_mut(&mut self) -> &mut [u8] {
504504
let header_len = self.header_len() as usize;
505-
let mut data = self.buffer.as_mut();
505+
let data = self.buffer.as_mut();
506506
&mut data[header_len..]
507507
}
508508
}

‎src/wire/udp.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -133,28 +133,28 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
133133
/// Set the source port field.
134134
#[inline]
135135
pub fn set_src_port(&mut self, value: u16) {
136-
let mut data = self.buffer.as_mut();
136+
let data = self.buffer.as_mut();
137137
NetworkEndian::write_u16(&mut data[field::SRC_PORT], value)
138138
}
139139

140140
/// Set the destination port field.
141141
#[inline]
142142
pub fn set_dst_port(&mut self, value: u16) {
143-
let mut data = self.buffer.as_mut();
143+
let data = self.buffer.as_mut();
144144
NetworkEndian::write_u16(&mut data[field::DST_PORT], value)
145145
}
146146

147147
/// Set the length field.
148148
#[inline]
149149
pub fn set_len(&mut self, value: u16) {
150-
let mut data = self.buffer.as_mut();
150+
let data = self.buffer.as_mut();
151151
NetworkEndian::write_u16(&mut data[field::LENGTH], value)
152152
}
153153

154154
/// Set the checksum field.
155155
#[inline]
156156
pub fn set_checksum(&mut self, value: u16) {
157-
let mut data = self.buffer.as_mut();
157+
let data = self.buffer.as_mut();
158158
NetworkEndian::write_u16(&mut data[field::CHECKSUM], value)
159159
}
160160

@@ -186,7 +186,7 @@ impl<'a, T: AsRef<[u8]> + AsMut<[u8]> + ?Sized> Packet<&'a mut T> {
186186
#[inline]
187187
pub fn payload_mut(&mut self) -> &mut [u8] {
188188
let length = self.len();
189-
let mut data = self.buffer.as_mut();
189+
let data = self.buffer.as_mut();
190190
&mut data[field::PAYLOAD(length)]
191191
}
192192
}

0 commit comments

Comments
 (0)
Please sign in to comment.