Skip to content

Commit 74d952b

Browse files
committed
Fix up various warnings
1 parent b52cf05 commit 74d952b

8 files changed

Lines changed: 9 additions & 10 deletions

File tree

framework/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ doctest = false
1010
[dependencies]
1111
libc = ">= 0.2.4"
1212
time = ">=0.1.0"
13-
simd = { git = "https://github.com/huonw/simd" }
1413
getopts = "*"
1514
byteorder = "*"
1615
clippy = { version = "*", optional = true }

framework/src/headers/ip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::slice;
99
use utils::Flow;
1010

1111
/// IP header using SSE
12-
#[derive(Debug, Default)]
12+
#[derive(Default)]
1313
#[repr(C, packed)]
1414
pub struct IpHeader {
1515
version_to_len: u32,

framework/src/headers/mac.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::fmt;
55
use std::hash::Hash;
66
use std::hash::Hasher;
77

8-
#[derive(Debug, Default)]
8+
#[derive(Default)]
99
#[repr(C, packed)]
1010
pub struct MacAddress {
1111
pub addr: [u8; 6],
@@ -66,7 +66,7 @@ impl Hash for MacAddress {
6666
}
6767

6868
/// A packet's MAC header.
69-
#[derive(Debug, Default)]
69+
#[derive(Default)]
7070
#[repr(C, packed)]
7171
pub struct MacHeader {
7272
pub dst: MacAddress,

framework/src/headers/null_header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::EndOffset;
22
use std::fmt;
33

4-
#[derive(Debug, Default)]
4+
#[derive(Default)]
55
#[repr(C, packed)]
66
pub struct NullHeader;
77

framework/src/headers/tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use headers::IpHeader;
33
use std::default::Default;
44
use std::fmt;
55

6-
#[derive(Debug, Default)]
6+
#[derive(Default)]
77
#[repr(C, packed)]
88
pub struct TcpHeader {
99
src_port: u16,

framework/src/headers/udp.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ use std::default::Default;
44
use std::fmt;
55

66
/// UDP header using SSE
7-
// #[repr(C, packed)]
8-
#[derive(Debug, Default)]
7+
#[derive(Default)]
98
#[repr(C, packed)]
109
pub struct UdpHeader {
1110
src_port: u16,

test/maglev/src/nf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub fn maglev<T: 'static + Batch<Header = NullHeader>, S: Scheduler + Sized>(
9393
.parse::<MacHeader>()
9494
.transform(box move |pkt| {
9595
assert!(pkt.refcnt() == 1);
96-
let mut hdr = pkt.get_mut_header();
96+
let hdr = pkt.get_mut_header();
9797
hdr.swap_addresses();
9898
})
9999
.group_by(

test/tcp_check/src/nf.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ pub fn tcp_nf<T: 'static + Batch<Header = NullHeader>>(parent: T) -> Composition
2424
"payload: {:x} {:x} {:x} {:x}",
2525
payload[0], payload[1], payload[2], payload[3]
2626
);
27-
println!("Src {} dst {}", flow.src_port, flow.dst_port);
27+
let (src, dst) = (flow.src_port, flow.dst_port);
28+
println!("Src {} dst {}", src, dst);
2829
})
2930
.parse::<UdpHeader>()
3031
.map(box |pkt| {

0 commit comments

Comments
 (0)